Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge4.out @ 801:1f9ec150a476

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated output of tests.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Jul 2005 15:21:02 +0100
parents 7e4843b7efd2
children 8f5637f0a0c0
comparison
equal deleted inserted replaced
800:ec85f9e6f3b1 801:1f9ec150a476
1 + hg init 1 + hg init
2 + echo This is file a1
3 + hg add a 2 + hg add a
4 + hg commit -m 'commit #0' -d '0 0' 3 + hg commit -m commit #0 -d 0 0
5 + echo This is file b1
6 + hg add b 4 + hg add b
7 + hg commit -m 'commit #1' -d '0 0' 5 + hg commit -m commit #1 -d 0 0
8 + hg update 0 6 + hg update 0
9 + echo This is file c1
10 + hg add c 7 + hg add c
11 + hg commit -m 'commit #2' -d '0 0' 8 + hg commit -m commit #2 -d 0 0
12 + hg update -m 1 9 + hg update -m 1
13 + rm b 10 + hg commit -m commit #3 -d 0 0
14 + echo This is file c22
15 + hg commit -m 'commit #3' -d '0 0'