Mercurial > hg
diff tests/test-imerge.out @ 5109:86327d13d916
imerge: handle renames
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Fri, 03 Aug 2007 18:05:20 -0700 |
parents | 58006f8b8275 |
children | 12930b97a729 |
line wrap: on
line diff
--- a/tests/test-imerge.out Wed Aug 01 23:59:19 2007 -0700 +++ b/tests/test-imerge.out Fri Aug 03 18:05:20 2007 -0700 @@ -1,45 +1,47 @@ adding bar adding foo -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 1 files removed, 0 files unresolved % start imerge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -merging e6da46716401 and 1c0a86e7db0d +merging e6da46716401 and 30d266f502e7 remaining: - foo + foo (foo2) foo bar bar bar % status -merging e6da46716401 and 1c0a86e7db0d +merging e6da46716401 and 30d266f502e7 remaining: - foo + foo (foo2) +% next +foo % merge next -merging foo +merging foo and foo2 all conflicts resolved % unresolve % merge foo -merging foo +merging foo and foo2 all conflicts resolved % save % load -2 files updated, 0 files merged, 0 files removed, 0 files unresolved +2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -merging e6da46716401 and 1c0a86e7db0d +merging e6da46716401 and 30d266f502e7 resolved: foo all conflicts resolved foo -changeset: 3:eaf80a943462 +changeset: 3:fa9a6defdcaf tag: tip parent: 2:e6da46716401 -parent: 1:1c0a86e7db0d +parent: 1:30d266f502e7 user: test date: Thu Jan 01 00:00:03 1970 +0000 -files: foo +files: foo foo2 description: merged