equal
deleted
inserted
replaced
32 failing merge |
32 failing merge |
33 |
33 |
34 $ hg up -qC 2 |
34 $ hg up -qC 2 |
35 $ hg merge --tool=internal:fail 1 |
35 $ hg merge --tool=internal:fail 1 |
36 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
36 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
37 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
37 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
38 [1] |
38 [1] |
39 |
39 |
40 resolve -l should contain unresolved entries |
40 resolve -l should contain unresolved entries |
41 |
41 |
42 $ hg resolve -l |
42 $ hg resolve -l |
221 get back to conflicting state |
221 get back to conflicting state |
222 |
222 |
223 $ hg up -qC 2 |
223 $ hg up -qC 2 |
224 $ hg merge --tool=internal:fail 1 |
224 $ hg merge --tool=internal:fail 1 |
225 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
225 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
226 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
226 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
227 [1] |
227 [1] |
228 |
228 |
229 resolve without arguments should suggest --all |
229 resolve without arguments should suggest --all |
230 $ hg resolve |
230 $ hg resolve |
231 abort: no files or directories specified |
231 abort: no files or directories specified |