equal
deleted
inserted
replaced
19 $ hg commit -Am 'append baz' |
19 $ hg commit -Am 'append baz' |
20 created new head |
20 created new head |
21 |
21 |
22 failing merge |
22 failing merge |
23 |
23 |
24 $ HGMERGE=internal:fail hg merge |
24 $ hg merge --tool=internal:fail |
25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
26 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
26 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
27 [1] |
27 [1] |
28 |
28 |
29 $ echo resolved > file |
29 $ echo resolved > file |