changeset 45619:64461b43a7bf

tests: add newfilenode test case in test-merge-changedelete.t
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 30 Sep 2020 15:09:25 +0530
parents d5407b2e7689
children ad984583969a
files tests/test-merge-changedelete.t
diffstat 1 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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)