Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add newfilenode test case in test-merge-changedelete.t
authorPulkit Goyal <7895pulkit@gmail.com>
Wed, 30 Sep 2020 15:09:25 +0530
changeset 45616 64461b43a7bf
parent 45615 d5407b2e7689
child 45617 ad984583969a
tests: add newfilenode test case in test-merge-changedelete.t
tests/test-merge-changedelete.t file | annotate | diff | comparison | revisions 
--- 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)
Mercurial