equal
deleted
inserted
replaced
26 |
26 |
27 $ hg merge --debug 1 |
27 $ hg merge --debug 1 |
28 searching for copies back to rev 1 |
28 searching for copies back to rev 1 |
29 unmatched files in other: |
29 unmatched files in other: |
30 1a |
30 1a |
31 all copies found (* = to merge, ! = divergent): |
31 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
32 1a -> 1 |
32 1a -> 1 |
33 checking for directory renames |
33 checking for directory renames |
34 resolving manifests |
34 resolving manifests |
35 overwrite: False, partial: False |
35 overwrite: False, partial: False |
36 ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a |
36 ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a |
57 |
57 |
58 $ hg merge -y --debug 4 |
58 $ hg merge -y --debug 4 |
59 searching for copies back to rev 1 |
59 searching for copies back to rev 1 |
60 unmatched files in local: |
60 unmatched files in local: |
61 1a |
61 1a |
62 all copies found (* = to merge, ! = divergent): |
62 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
63 1a -> 1 * |
63 1a -> 1 * |
64 checking for directory renames |
64 checking for directory renames |
65 resolving manifests |
65 resolving manifests |
66 overwrite: False, partial: False |
66 overwrite: False, partial: False |
67 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 |
67 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 |
80 |
80 |
81 $ hg merge -y --debug 3 |
81 $ hg merge -y --debug 3 |
82 searching for copies back to rev 1 |
82 searching for copies back to rev 1 |
83 unmatched files in other: |
83 unmatched files in other: |
84 1a |
84 1a |
85 all copies found (* = to merge, ! = divergent): |
85 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
86 1a -> 1 * |
86 1a -> 1 * |
87 checking for directory renames |
87 checking for directory renames |
88 resolving manifests |
88 resolving manifests |
89 overwrite: False, partial: False |
89 overwrite: False, partial: False |
90 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 |
90 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 |