equal
deleted
inserted
replaced
29 merging bar |
29 merging bar |
30 merging bar failed! |
30 merging bar failed! |
31 merging foo and baz to baz |
31 merging foo and baz to baz |
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 update -C .' to abandon |
|
34 [1] |
34 $ hg resolve -l |
35 $ hg resolve -l |
35 U bar |
36 U bar |
36 R baz |
37 R baz |
37 |
38 |
38 test with the rename on the local side |
39 test with the rename on the local side |
42 merging bar |
43 merging bar |
43 merging bar failed! |
44 merging bar failed! |
44 merging baz and foo to baz |
45 merging baz and foo to baz |
45 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 |
46 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 update -C .' to abandon |
|
48 [1] |
47 |
49 |
48 show unresolved |
50 show unresolved |
49 $ hg resolve -l |
51 $ hg resolve -l |
50 U bar |
52 U bar |
51 R baz |
53 R baz |
73 R baz |
75 R baz |
74 |
76 |
75 resolve all warning |
77 resolve all warning |
76 $ hg resolve |
78 $ hg resolve |
77 abort: no files or directories specified; use --all to remerge all files |
79 abort: no files or directories specified; use --all to remerge all files |
|
80 [255] |
78 |
81 |
79 resolve all |
82 resolve all |
80 $ hg resolve -a |
83 $ hg resolve -a |
81 merging bar |
84 merging bar |
82 warning: conflicts during merge. |
85 warning: conflicts during merge. |
83 merging bar failed! |
86 merging bar failed! |
|
87 [1] |
84 |
88 |
85 after |
89 after |
86 $ hg resolve -l |
90 $ hg resolve -l |
87 U bar |
91 U bar |
88 R baz |
92 R baz |