# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1601458765 -19800
# Node ID 64461b43a7bf1f729dab39e39f4c2f77a432e5ce
# Parent  d5407b2e7689c0526ff24bb1434818b8aa9b4fc4
tests: add newfilenode test case in test-merge-changedelete.t

diff -r d5407b2e7689 -r 64461b43a7bf tests/test-merge-changedelete.t
--- a/tests/test-merge-changedelete.t	Thu Oct 01 09:49:33 2020 +0200
+++ b/tests/test-merge-changedelete.t	Wed Sep 30 15:09:25 2020 +0530
@@ -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)