Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge1.out @ 925:5a034646e472

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: remove '+ hg' trick This was causing me a fair amount of debugging confusion. Let's just forget it entirely. Updated tests to match.
author mpm@selenic.com
date Tue, 16 Aug 2005 19:03:01 -0800
parents 0902ffece4b4
children 67a28636ea64
line wrap: on
line diff
--- a/tests/test-merge1.out
+++ b/tests/test-merge1.out
@@ -1,45 +1,7 @@
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
-+ hg add b
-+ hg commit -m commit #1 -d 0 0
-+ hg update 0
-+ hg add c
-+ hg commit -m commit #2 -d 0 0
-+ hg update -m 1
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
-+ hg add b
-+ hg commit -m commit #1 -d 0 0
-+ hg update 0
-+ hg add c
-+ hg commit -m commit #2 -d 0 0
-+ hg update -m 1
 merging for b
 merging b
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
-+ hg add b
-+ hg commit -m commit #1 -d 0 0
-+ hg commit -m commit #2 -d 0 0
-+ hg update 1
-+ hg add c
-+ hg commit -m commit #3 -d 0 0
 This is file b1
-+ hg update -m 2
 merging for b
 merging b
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
-+ hg add b
-+ hg commit -m commit #1 -d 0 0
-+ hg commit -m commit #2 -d 0 0
-+ hg update 1
-+ hg add c
-+ hg commit -m commit #3 -d 0 0
-+ hg update -m 2
 merging for b
 merging b