Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge1.out @ 3329:f472cf9a71af
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 11 Oct 2006 16:41:52 +0200 |
parents | 49966b5ab16f 966632304dde |
children | d2b55e3c4e25 |
comparison
equal
deleted
inserted
replaced
3328:49966b5ab16f | 3329:f472cf9a71af |
---|---|
1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2 %% no merges expected | 2 %% no merges expected |
3 merging for b | |
4 merging b | |
5 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
6 (branch merge, don't forget to commit) | 4 (branch merge, don't forget to commit) |
7 diff -r d9e5953b9dec b | 5 diff -r d9e5953b9dec b |
8 --- /dev/null | 6 --- /dev/null |
9 +++ b/b | 7 +++ b/b |
29 Contents of b should be "this is file b1" | 27 Contents of b should be "this is file b1" |
30 This is file b1 | 28 This is file b1 |
31 %% merge fails | 29 %% merge fails |
32 abort: outstanding uncommitted changes | 30 abort: outstanding uncommitted changes |
33 %% merge expected! | 31 %% merge expected! |
34 merging for b | |
35 merging b | |
36 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 32 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
37 (branch merge, don't forget to commit) | 33 (branch merge, don't forget to commit) |
38 diff -r c1dd73cbf59f b | 34 diff -r c1dd73cbf59f b |
39 --- a/b | 35 --- a/b |
40 +++ b/b | 36 +++ b/b |