equal
deleted
inserted
replaced
25 created new head |
25 created new head |
26 |
26 |
27 test with the rename on the remote side |
27 test with the rename on the remote side |
28 $ HGMERGE=false hg merge |
28 $ HGMERGE=false hg merge |
29 merging bar |
29 merging bar |
|
30 merging bar failed! |
30 merging foo and baz to baz |
31 merging foo and baz to baz |
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 merge --abort' 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 |
39 test with the rename on the local side |
39 test with the rename on the local side |
40 $ hg up -C 1 |
40 $ hg up -C 1 |
41 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
41 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
42 $ HGMERGE=false hg merge |
42 $ HGMERGE=false hg merge |
43 merging bar |
43 merging bar |
|
44 merging bar failed! |
44 merging baz and foo to baz |
45 merging baz and foo to baz |
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 merge --abort' 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 |