[PATCH 1 of 4] tests: add newfilenode test case in test-merge-changedelete.t

[Pulkit Goyal]

# HG changeset patch
# User Pulkit Goyal <7895pulkit at gmail.com>
# Date 1601458765 -19800
#      Wed Sep 30 15:09:25 2020 +0530
# Node ID aa8ac5a5deb695a489172726016d3be57ad17cc1
# Parent  db11f8f39cafb7973f1cc7076c5e6e595440501e
# EXP-Topic merge-newnode-final
tests: add newfilenode test case in test-merge-changedelete.t

diff --git a/tests/test-merge-changedelete.t b/tests/test-merge-changedelete.t
--- a/tests/test-merge-changedelete.t
+++ b/tests/test-merge-changedelete.t
@@ -1,3 +1,15 @@
+#testcases newfilenode old
+
+#if newfilenode
+Enable the config option
+------------------------
+
+  $ cat >> $HGRCPATH <<EOF
+  > [experimental]
+  > merge-track-salvaged = True
+  > EOF
+#endif
+
 Tests for change/delete conflicts, including:
 b5605d88dc27: Make ui.prompt repeat on "unrecognized response" again
  (issue897)