Mercurial > public > mercurial-scm > hg

diff tests/test-merge4 @ 2283:e506c14382fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deprecate 'update -m'. use 'merge' instead.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 14 May 2006 21:07:34 -0700
parents 7544700fd931
children
line wrap: on
line diff
--- a/tests/test-merge4	Sun May 14 17:37:34 2006 -0700
+++ b/tests/test-merge4	Sun May 14 21:07:34 2006 -0700
@@ -11,7 +11,7 @@
 echo This is file c1 > c
 hg add c
 hg commit -m "commit #2" -d "1000000 0"
-hg update -m 1
+hg merge 1
 rm b
 echo This is file c22 > c
 hg commit -m "commit #3" -d "1000000 0"