Mercurial > hg
diff tests/test-merge9.out @ 6042:2da5b19a6460
Merge with crew
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Wed, 06 Feb 2008 19:57:52 -0800 |
| parents | 5af5f0f9d724 |
| children | 4b0c9c674707 |
line wrap: on
line diff
--- a/tests/test-merge9.out Thu Jul 26 07:56:27 2007 -0400 +++ b/tests/test-merge9.out Wed Feb 06 19:57:52 2008 -0800 @@ -5,8 +5,7 @@ merging bar merging bar failed! merging foo and baz -merging foo failed! -1 files updated, 0 files merged, 0 files removed, 2 files unresolved +1 files updated, 1 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 2 hg merge 1 @@ -14,8 +13,7 @@ merging bar merging bar failed! merging baz and foo -merging baz failed! -1 files updated, 0 files merged, 0 files removed, 2 files unresolved +1 files updated, 1 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 1 hg merge 2