Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-interrupted.t
branchmercurial-4.8
changeset 4865 31c481934138
parent 4848 535ab2609e45
child 5161 58b225aa4298 
--- a/tests/test-evolve-interrupted.t	Fri Sep 27 13:03:14 2019 +0200
+++ b/tests/test-evolve-interrupted.t	Fri Sep 27 13:03:16 2019 +0200
@@ -42,7 +42,7 @@
   x  0 apricot
   
 
-  $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other
+  $ HGMERGE=internal:other hg evolve --update --config hooks.precommit=false --config ui.merge=internal:other
   move:[1] banana
   atop:[2] apricot and blueberry
   transaction abort!
@@ -102,7 +102,7 @@
   x  0 apricot
   
 
-  $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other
+  $ HGMERGE=internal:other hg evolve --update --config hooks.precommit=false --config ui.merge=:other
   move:[1] banana
   atop:[2] apricot and blueberry
   transaction abort!
@@ -127,7 +127,7 @@
   x  0 apricot
   
 
-  $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other
+  $ HGMERGE=internal:other hg evolve --update --config hooks.precommit=false --config ui.merge=:other
   move:[1] banana
   atop:[2] apricot and blueberry
   transaction abort!
evolve