Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge4.out @ 808:8f5637f0a0c0
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Sat, 30 Jul 2005 08:35:29 -0800 |
parents | 7e4843b7efd2 1f9ec150a476 |
children | 0902ffece4b4 |
comparison
equal
deleted
inserted
replaced
788:64d2a558c943 | 808:8f5637f0a0c0 |
---|---|
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' |