equal
deleted
inserted
replaced
76 note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 |
76 note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 |
77 alternatively, use --config merge.preferancestor=40663881a6dd |
77 alternatively, use --config merge.preferancestor=40663881a6dd |
78 resolving manifests |
78 resolving manifests |
79 branchmerge: True, force: False, partial: False |
79 branchmerge: True, force: False, partial: False |
80 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
80 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
81 preserving f2 for resolve of f2 |
|
82 f1: remote is newer -> g |
81 f1: remote is newer -> g |
83 getting f1 |
82 getting f1 |
|
83 preserving f2 for resolve of f2 |
84 f2: versions differ -> m (premerge) |
84 f2: versions differ -> m (premerge) |
85 picked tool ':dump' for f2 (binary False symlink False changedelete False) |
85 picked tool ':dump' for f2 (binary False symlink False changedelete False) |
86 merging f2 |
86 merging f2 |
87 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 |
87 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 |
88 f2: versions differ -> m (merge) |
88 f2: versions differ -> m (merge) |