equal
deleted
inserted
replaced
151 use 'hg resolve' to retry unresolved file merges |
151 use 'hg resolve' to retry unresolved file merges |
152 [1] |
152 [1] |
153 $ hg up 0 |
153 $ hg up 0 |
154 abort: outstanding merge conflicts |
154 abort: outstanding merge conflicts |
155 (use 'hg resolve' to resolve) |
155 (use 'hg resolve' to resolve) |
156 [255] |
156 [20] |
157 $ hg merge 2 |
157 $ hg merge 2 |
158 abort: outstanding merge conflicts |
158 abort: outstanding merge conflicts |
159 (use 'hg resolve' to resolve) |
159 (use 'hg resolve' to resolve) |
160 [255] |
160 [20] |
161 $ hg merge --force 2 |
161 $ hg merge --force 2 |
162 abort: outstanding merge conflicts |
162 abort: outstanding merge conflicts |
163 (use 'hg resolve' to resolve) |
163 (use 'hg resolve' to resolve) |
164 [255] |
164 [20] |
165 |
165 |
166 set up conflict-free merge |
166 set up conflict-free merge |
167 |
167 |
168 $ hg up -qC 3 |
168 $ hg up -qC 3 |
169 $ hg merge 1 |
169 $ hg merge 1 |