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-filebranch
changeset 2283 e506c14382fd
parent 1933 7544700fd931
child 3736 ad3d5b4367cb 
--- a/tests/test-filebranch	Sun May 14 17:37:34 2006 -0700
+++ b/tests/test-filebranch	Sun May 14 21:07:34 2006 -0700
@@ -41,7 +41,7 @@
 
 echo merging
 hg pull ../a
-env HGMERGE=../merge hg update -vm
+env HGMERGE=../merge hg merge -v
 
 echo 2m > foo
 echo 2b > baz
mercurial