equal
deleted
inserted
replaced
81 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
81 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
82 preserving f2 for resolve of f2 |
82 preserving f2 for resolve of f2 |
83 f1: remote is newer -> g |
83 f1: remote is newer -> g |
84 getting f1 |
84 getting f1 |
85 f2: versions differ -> m |
85 f2: versions differ -> m |
86 picked tool 'internal:dump' for f2 (binary False symlink False) |
86 picked tool ':dump' for f2 (binary False symlink False) |
87 merging f2 |
87 merging f2 |
88 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c |
88 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c |
89 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
89 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
90 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
90 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
91 [1] |
91 [1] |