Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge9.out @ 4681:dc5920ea12f8
merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 22 Jun 2007 20:44:40 -0300 |
| parents | |
| children | f191bc3916f7 |
comparison
equal
deleted
inserted
replaced
| 4680:059bdc8dfb9d | 4681:dc5920ea12f8 |
|---|---|
| 1 adding bar | |
| 2 adding foo | |
| 3 adding quux1 | |
| 4 adding quux2 | |
| 5 merging bar | |
| 6 merging bar failed! | |
| 7 merging foo and baz | |
| 8 merging foo failed! | |
| 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: | |
| 11 hg update -C 2 | |
| 12 hg merge 1 | |
| 13 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 14 merging bar | |
| 15 merging bar failed! | |
| 16 merging baz and foo | |
| 17 merging baz failed! | |
| 18 1 files updated, 0 files merged, 0 files removed, 2 files unresolved | |
| 19 There are unresolved merges, you can redo the full merge using: | |
| 20 hg update -C 1 | |
| 21 hg merge 2 |