Mercurial > hg
diff tests/test-rename-merge1.out @ 3331:f472cf9a71af
merge with crew
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 11 Oct 2006 16:41:52 +0200 |
| parents | b16456909a0a |
| children | f4dece0f7016 |
line wrap: on
line diff
--- a/tests/test-rename-merge1.out Wed Oct 11 16:35:09 2006 +0200 +++ b/tests/test-rename-merge1.out Wed Oct 11 16:41:52 2006 +0200 @@ -2,13 +2,12 @@ 2 files updated, 0 files merged, 2 files removed, 0 files unresolved merge resolving manifests - overwrite None branchmerge True partial False - ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c - a: remote moved -> c + overwrite None partial False + ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 + a: remote moved -> m b2: remote created -> g -merging a and b to b -resolving a -my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c +merging a and b +my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c copying a to b removing a getting b2