Mercurial Mercurial > mercurial / 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-rename-merge2.t
changeset 12788 de793925862e
parent 12757 62c8f7691bc3
child 13956 ffb5c09ba822 
--- a/tests/test-rename-merge2.t	Wed Oct 20 20:19:34 2010 +0200
+++ b/tests/test-rename-merge2.t	Tue Oct 19 22:33:52 2010 -0500
@@ -7,7 +7,6 @@
   > f.write("merge %s %s %s" % (sys.argv[1], sys.argv[2], sys.argv[3]))
   > f.close()
   > EOF
-  $ HGMERGE="python ../merge"; export HGMERGE
 
 perform a test merge with possible renaming
 args:
@@ -49,7 +48,7 @@
   >     echo "--------------"
   >     echo "test L:$1 R:$2 W:$3 - $4"
   >     echo "--------------"
-  >     hg merge -y --debug --traceback
+  >     hg merge -y --debug --traceback --tool="python ../merge"
   > 
   >     echo "--------------"
   >     hg status -camC -X rev
mercurial