Mercurial > hg
view tests/test-imerge.out @ 5110:420e1166a876
Merge with crew
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sat, 04 Aug 2007 09:33:10 -0700 |
parents | 86327d13d916 |
children | 12930b97a729 |
line wrap: on
line source
adding bar adding foo 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 30d266f502e7 remaining: foo (foo2) foo bar bar bar % status merging e6da46716401 and 30d266f502e7 remaining: foo (foo2) % next foo % merge next merging foo and foo2 all conflicts resolved % unresolve % merge foo merging foo and foo2 all conflicts resolved % save % 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 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) merging e6da46716401 and 30d266f502e7 resolved: foo all conflicts resolved foo changeset: 3:fa9a6defdcaf tag: tip parent: 2:e6da46716401 parent: 1:30d266f502e7 user: test date: Thu Jan 01 00:00:03 1970 +0000 files: foo foo2 description: merged % nothing to merge abort: there is nothing to merge - use "hg update" instead