Mercurial > hg
diff tests/test-imerge.out @ 6362:bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 23 Mar 2008 20:37:02 +0100 |
parents | 4b0c9c674707 |
children | bbfebf751ac8 |
line wrap: on
line diff
--- a/tests/test-imerge.out Sun Mar 23 18:52:02 2008 +0100 +++ b/tests/test-imerge.out Sun Mar 23 20:37:02 2008 +0100 @@ -23,6 +23,20 @@ merging foo and foo2 all conflicts resolved % save +% merge auto +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +merging foo2 and foo +warning: conflicts during merge. +merging foo2 failed! +U foo2 +foo +<<<<<<< local +foo +======= +bar +>>>>>>> other % load 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved