equal
deleted
inserted
replaced
23 $ echo unrelated >> 2 |
23 $ echo unrelated >> 2 |
24 $ hg ci -m unrelated1 # 2 |
24 $ hg ci -m unrelated1 # 2 |
25 created new head |
25 created new head |
26 |
26 |
27 $ hg merge --debug 1 |
27 $ hg merge --debug 1 |
28 searching for copies back to rev 1 |
|
29 unmatched files in other: |
28 unmatched files in other: |
30 1a |
29 1a |
31 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
30 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
32 src: '1' -> dst: '1a' |
31 src: '1' -> dst: '1a' |
33 checking for directory renames |
32 checking for directory renames |
52 |
51 |
53 $ hg co -C 3 |
52 $ hg co -C 3 |
54 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
53 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
55 |
54 |
56 $ hg merge -y --debug 4 |
55 $ hg merge -y --debug 4 |
57 searching for copies back to rev 1 |
|
58 unmatched files in local: |
56 unmatched files in local: |
59 1a |
57 1a |
60 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
58 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
61 src: '1' -> dst: '1a' * |
59 src: '1' -> dst: '1a' * |
62 checking for directory renames |
60 checking for directory renames |
75 |
73 |
76 $ hg co -C 4 |
74 $ hg co -C 4 |
77 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
75 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
78 |
76 |
79 $ hg merge -y --debug 3 |
77 $ hg merge -y --debug 3 |
80 searching for copies back to rev 1 |
|
81 unmatched files in other: |
78 unmatched files in other: |
82 1a |
79 1a |
83 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
80 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
84 src: '1' -> dst: '1a' * |
81 src: '1' -> dst: '1a' * |
85 checking for directory renames |
82 checking for directory renames |