equal
deleted
inserted
replaced
27 $ hg merge --debug |
27 $ hg merge --debug |
28 searching for copies back to rev 1 |
28 searching for copies back to rev 1 |
29 unmatched files in local: |
29 unmatched files in local: |
30 bar |
30 bar |
31 resolving manifests |
31 resolving manifests |
32 overwrite: False, partial: False |
32 branchmerge: True, force: False, partial: False |
33 ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee |
33 ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee |
34 foo: remote is newer -> g |
34 foo: remote is newer -> g |
35 updating: foo 1/1 files (100.00%) |
35 updating: foo 1/1 files (100.00%) |
36 getting foo |
36 getting foo |
37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |