Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-rename-merge1.out @ 3320:b16456909a0a
merge: various tidying
update tests to handle corrected output and new workingctx display
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 10 Oct 2006 02:15:20 -0500 |
parents | 966632304dde |
children | f4dece0f7016 |
line wrap: on
line diff
--- a/tests/test-rename-merge1.out +++ b/tests/test-rename-merge1.out @@ -2,12 +2,12 @@ checkout 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 + overwrite None partial False + ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 a: remote moved -> m b2: remote created -> g merging a and b -my a@. other b@8e765a822af2 ancestor a@af1939970a1c +my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c copying a to b removing a getting b2