equal
deleted
inserted
replaced
28 $ HGMERGE=false hg merge |
28 $ HGMERGE=false hg merge |
29 merging bar |
29 merging bar |
30 merging foo and baz to baz |
30 merging foo and baz to baz |
31 merging bar failed! |
31 merging bar failed! |
32 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
32 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
33 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
33 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
34 [1] |
34 [1] |
35 $ hg resolve -l |
35 $ hg resolve -l |
36 U bar |
36 U bar |
37 R baz |
37 R baz |
38 |
38 |
42 $ HGMERGE=false hg merge |
42 $ HGMERGE=false hg merge |
43 merging bar |
43 merging bar |
44 merging baz and foo to baz |
44 merging baz and foo to baz |
45 merging bar failed! |
45 merging bar failed! |
46 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
46 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
47 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
47 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
48 [1] |
48 [1] |
49 |
49 |
50 show unresolved |
50 show unresolved |
51 $ hg resolve -l |
51 $ hg resolve -l |
52 U bar |
52 U bar |