equal
deleted
inserted
replaced
83 f1: remote is newer -> g |
83 f1: remote is newer -> g |
84 getting f1 |
84 getting f1 |
85 f2: versions differ -> m (premerge) |
85 f2: versions differ -> m (premerge) |
86 picked tool ':dump' for f2 (binary False symlink False changedelete False) |
86 picked tool ':dump' for f2 (binary False symlink False changedelete 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@0f6b37dbe527 |
89 f2: versions differ -> m (merge) |
89 f2: versions differ -> m (merge) |
90 picked tool ':dump' for f2 (binary False symlink False changedelete False) |
90 picked tool ':dump' for f2 (binary False symlink False changedelete False) |
91 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c |
91 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 |
92 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
92 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
93 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
93 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
94 [1] |
94 [1] |
95 |
95 |
96 $ head * |
96 $ head * |