Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-rename-merge1.out @ 3317:966632304dde
merge: shortcircuit filemerge for identical files
- use filectx.cmp to compare files
- move merge messages into filemerge
- kill the redundant resolving message
- update tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 10 Oct 2006 01:16:06 -0500 |
parents | ecc1bf27378c |
children | b16456909a0a |
comparison
equal
deleted
inserted
replaced
3316:0e370798eebf | 3317:966632304dde |
---|---|
4 resolving manifests | 4 resolving manifests |
5 overwrite None branchmerge True partial False | 5 overwrite None branchmerge True partial False |
6 ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c | 6 ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c |
7 a: remote moved -> m | 7 a: remote moved -> m |
8 b2: remote created -> g | 8 b2: remote created -> g |
9 merging a and b to b | 9 merging a and b |
10 resolving a | |
11 my a@. other b@8e765a822af2 ancestor a@af1939970a1c | 10 my a@. other b@8e765a822af2 ancestor a@af1939970a1c |
12 copying a to b | 11 copying a to b |
13 removing a | 12 removing a |
14 getting b2 | 13 getting b2 |
15 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 14 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |