Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-confused-revert @ 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 6c6c0e5595a2
children 890e285c52a1
line wrap: on
line diff
--- a/tests/test-confused-revert
+++ b/tests/test-confused-revert
@@ -28,7 +28,7 @@ hg co -C 0
 echo foo-b > a
 hg commit -m "2b" -d "1000000 0"
 
-HGMERGE=true hg update -m 1
+HGMERGE=true hg merge 1
 
 echo "%%% should show foo-b"
 cat a