Mercurial > hg > gitweb

diff tests/test-conflict @ 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 46280c004f22
line wrap: on
line diff
--- a/tests/test-conflict	Sun May 14 17:37:34 2006 -0700
+++ b/tests/test-conflict	Sun May 14 21:07:34 2006 -0700
@@ -10,7 +10,7 @@
 echo "something else" > a
 hg commit -m branch2 -d "1000000 0"
 HGMERGE=merge; export HGMERGE
-hg up -m 1
+hg merge 1
 hg id
 egrep -v ">>>|<<<" a
 hg status