Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge1.out @ 3008:6e49bb42620b
merge.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Wed, 23 Aug 2006 08:42:21 -0700 |
| parents | a31557193f3c |
| children | 966632304dde 49966b5ab16f |
comparison
equal
deleted
inserted
replaced
| 2996:06696f9c30c0 | 3008:6e49bb42620b |
|---|---|
| 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 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 3 merging for b |
| 4 merging b | |
| 5 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 4 (branch merge, don't forget to commit) | 6 (branch merge, don't forget to commit) |
| 5 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 7 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 6 %% merge should fail | 8 %% merge should fail |
| 7 abort: 'b' already exists in the working dir and differs from remote | 9 abort: 'b' already exists in the working dir and differs from remote |
| 8 %% merge of b expected | 10 %% merge of b expected |