Mercurial > hg > mercurial-crew-with-dirclash
diff 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 |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/tests/test-merge9.out @@ -0,0 +1,21 @@ +adding bar +adding foo +adding quux1 +adding quux2 +merging bar +merging bar failed! +merging foo and baz +merging foo failed! +1 files updated, 0 files merged, 0 files removed, 2 files unresolved +There are unresolved merges, you can redo the full merge using: + hg update -C 2 + hg merge 1 +3 files updated, 0 files merged, 1 files removed, 0 files unresolved +merging bar +merging bar failed! +merging baz and foo +merging baz failed! +1 files updated, 0 files merged, 0 files removed, 2 files unresolved +There are unresolved merges, you can redo the full merge using: + hg update -C 1 + hg merge 2