Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-conflict.out @ 749:7e4843b7efd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update tests to use commit -m and default -u manifest hash: 6e4385453843031a712005a320d6000595b40d05
author mpm@selenic.com
date Thu, 21 Jul 2005 15:05:17 -0500
parents c5df1a9c5276
children 1f9ec150a476 8f5637f0a0c0 0902ffece4b4
line wrap: on
line diff
--- a/tests/test-conflict.out
+++ b/tests/test-conflict.out
@@ -1,12 +1,12 @@
 + hg init
 + echo nothing
 + hg add a
-+ hg commit -t ancestor -u test -d '0 0'
++ hg commit -m ancestor -d '0 0'
 + echo something
-+ hg commit -t branch1 -u test -d '0 0'
++ hg commit -m branch1 -d '0 0'
 + hg co 0
 + echo 'something else'
-+ hg commit -t branch2 -u test -d '0 0'
++ hg commit -m branch2 -d '0 0'
 + export HGMERGE=merge
 + HGMERGE=merge
 + hg up -m 1