Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-hook @ 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 3f7692b0ff13
children 109a22f5434a
line wrap: on
line diff
--- a/tests/test-hook
+++ b/tests/test-hook
@@ -29,7 +29,7 @@ hg update -C 0
 echo b > b
 hg add b
 hg commit -m b -d '1 0'
-hg update -m 1
+hg merge 1
 hg commit -m merge -d '2 0'
 
 cd ../b