equal
deleted
inserted
replaced
109 my f2@6373bbfdae1d+ other f2@e673248094b1 ancestor f2@0f6b37dbe527 |
109 my f2@6373bbfdae1d+ other f2@e673248094b1 ancestor f2@0f6b37dbe527 |
110 f2: versions differ -> m (merge) |
110 f2: versions differ -> m (merge) |
111 picked tool ':dump' for f2 (binary False symlink False changedelete False) |
111 picked tool ':dump' for f2 (binary False symlink False changedelete False) |
112 my f2@6373bbfdae1d+ other f2@e673248094b1 ancestor f2@0f6b37dbe527 |
112 my f2@6373bbfdae1d+ other f2@e673248094b1 ancestor f2@0f6b37dbe527 |
113 3 files updated, 0 files merged, 0 files removed, 1 files unresolved |
113 3 files updated, 0 files merged, 0 files removed, 1 files unresolved |
114 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
114 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
115 [1] |
115 [1] |
116 |
116 |
117 $ f --dump --recurse * |
117 $ f --dump --recurse * |
118 d2: directory with 2 files |
118 d2: directory with 2 files |
119 d2/f3: |
119 d2/f3: |
156 resolving manifests |
156 resolving manifests |
157 getting f1 |
157 getting f1 |
158 getting d1/f3 to d2/f3 |
158 getting d1/f3 to d2/f3 |
159 merging f2 |
159 merging f2 |
160 3 files updated, 0 files merged, 0 files removed, 1 files unresolved |
160 3 files updated, 0 files merged, 0 files removed, 1 files unresolved |
161 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
161 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
162 [1] |
162 [1] |
163 |
163 |
164 Redo merge with merge.preferancestor="*" to enable bid merge |
164 Redo merge with merge.preferancestor="*" to enable bid merge |
165 |
165 |
166 $ rm f* |
166 $ rm f* |