Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge9.out @ 5058:a3d6de2838de
merge with hg-stable
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Thu, 02 Aug 2007 13:03:25 +0200 |
| parents | f191bc3916f7 |
| children |
comparison
equal
deleted
inserted
replaced
| 5048:8db8e1100f3f | 5058:a3d6de2838de |
|---|---|
| 3 adding quux1 | 3 adding quux1 |
| 4 adding quux2 | 4 adding quux2 |
| 5 merging bar | 5 merging bar |
| 6 merging bar failed! | 6 merging bar failed! |
| 7 merging foo and baz | 7 merging foo and baz |
| 8 merging foo failed! | 8 merging baz failed! |
| 9 1 files updated, 0 files merged, 0 files removed, 2 files unresolved | 9 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
| 10 There are unresolved merges, you can redo the full merge using: | 10 There are unresolved merges, you can redo the full merge using: |
| 11 hg update -C 2 | 11 hg update -C 2 |
| 12 hg merge 1 | 12 hg merge 1 |
| 13 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | 13 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |