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-merge-symlinks.t
changeset 12788 de793925862e
parent 12459 15f07e8e4742
child 13439 d724a69309e0 
--- a/tests/test-merge-symlinks.t	Wed Oct 20 20:19:34 2010 +0200
+++ b/tests/test-merge-symlinks.t	Tue Oct 19 22:33:52 2010 -0500
@@ -37,7 +37,7 @@
 Merge them and display *_ISLINK vars
 merge heads
 
-  $ HGMERGE="python ../echo.py" hg merge
+  $ hg merge --tool="python ../echo.py"
   HG_FILE l
   HG_MY_ISLINK 1
   HG_OTHER_ISLINK 0
mercurial