Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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-globalopts
changeset 4361 46280c004f22
parent 2831 0b9ac7dfcf56
child 4728 7bb5bcb089e3 
--- a/tests/test-globalopts
+++ b/tests/test-globalopts
@@ -17,7 +17,7 @@ cd ..
 hg clone a c
 cd c
 hg pull -f ../b
-HGMERGE=merge hg merge
+hg merge
 
 cd ..
mercurial-crew-with-dirclash