equal
deleted
inserted
replaced
17 created new head |
17 created new head |
18 |
18 |
19 $ hg merge --debug |
19 $ hg merge --debug |
20 searching for copies back to rev 1 |
20 searching for copies back to rev 1 |
21 resolving manifests |
21 resolving manifests |
22 overwrite None partial False |
22 overwrite: False, partial: False |
23 ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c |
23 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
24 conflicting flags for a |
24 conflicting flags for a |
25 (n)one, e(x)ec or sym(l)ink? n |
25 (n)one, e(x)ec or sym(l)ink? n |
26 a: update permissions -> e |
26 a: update permissions -> e |
27 updating: a 1/1 files (100.00%) |
27 updating: a 1/1 files (100.00%) |
28 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
45 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
45 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
46 |
46 |
47 $ hg merge --debug |
47 $ hg merge --debug |
48 searching for copies back to rev 1 |
48 searching for copies back to rev 1 |
49 resolving manifests |
49 resolving manifests |
50 overwrite None partial False |
50 overwrite: False, partial: False |
51 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f |
51 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
52 conflicting flags for a |
52 conflicting flags for a |
53 (n)one, e(x)ec or sym(l)ink? n |
53 (n)one, e(x)ec or sym(l)ink? n |
54 a: remote is newer -> g |
54 a: remote is newer -> g |
55 updating: a 1/1 files (100.00%) |
55 updating: a 1/1 files (100.00%) |
56 getting a |
56 getting a |