Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 986:c1f8ece4182d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: add --tool option so we don't have to use HGMERGE
author Greg Ward <greg@gerg.ca>
date Sun, 22 Jun 2014 20:10:07 -0400
parents b286f77d680c
children 574315ec19c2
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Sun Jun 22 12:01:11 2014 -0400
+++ b/tests/test-stabilize-conflict.t	Sun Jun 22 20:10:07 2014 -0400
@@ -209,7 +209,7 @@
   $ hg amend
   1 new unstable changesets
   $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH
-  $ HGMERGE=touch hg evolve <<EOF
+  $ hg evolve --tool touch <<EOF
   > n
   > EOF
   move:[8] babar count up to fifteen