91 branchmerge: True, force: False, partial: False |
91 branchmerge: True, force: False, partial: False |
92 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
92 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
93 f1: remote is newer -> g |
93 f1: remote is newer -> g |
94 getting f1 |
94 getting f1 |
95 preserving f2 for resolve of f2 |
95 preserving f2 for resolve of f2 |
96 f2: versions differ -> m (premerge) |
96 f2: versions differ -> m |
97 picked tool ':dump' for f2 (binary False symlink False changedelete False) |
97 picked tool ':dump' for f2 (binary False symlink False changedelete False) |
98 merging f2 |
98 merging f2 |
99 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 |
99 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 |
100 f2: versions differ -> m (merge) |
|
101 picked tool ':dump' for f2 (binary False symlink False changedelete False) |
100 picked tool ':dump' for f2 (binary False symlink False changedelete False) |
102 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 |
101 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 |
103 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
102 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
104 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
103 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
105 [1] |
104 [1] |