tests/test-merge-criss-cross.t
changeset 45579 b9d6ab6cdeb4
parent 45524 6877b0ee5f9d
child 45581 76b69f81629c
--- a/tests/test-merge-criss-cross.t	Wed Sep 23 14:20:49 2020 -0400
+++ b/tests/test-merge-criss-cross.t	Mon Sep 14 14:31:23 2020 +0530
@@ -1,3 +1,15 @@
+#testcases old newfilenode
+
+#if newfilenode
+Enable the config option
+------------------------
+
+  $ cat >> $HGRCPATH <<EOF
+  > [experimental]
+  > merge-track-salvaged = True
+  > EOF
+#endif
+
 Criss cross merging
 
   $ hg init criss-cross