equal
deleted
inserted
replaced
45 $ hg merge |
45 $ hg merge |
46 merging test.txt |
46 merging test.txt |
47 warning: conflicts during merge. |
47 warning: conflicts during merge. |
48 merging test.txt failed! |
48 merging test.txt failed! |
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
50 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
50 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
51 resolve conflict |
51 resolve conflict |
52 $ cat >test.txt <<"EOF" |
52 $ cat >test.txt <<"EOF" |
53 > one |
53 > one |
54 > two-point-five |
54 > two-point-five |
55 > three |
55 > three |
89 merging test.txt |
89 merging test.txt |
90 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
90 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
91 warning: conflicts during merge. |
91 warning: conflicts during merge. |
92 merging test.txt failed! |
92 merging test.txt failed! |
93 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
93 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
94 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
94 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
95 |
95 |
96 $ cat test.txt |
96 $ cat test.txt |
97 one |
97 one |
98 <<<<<<< local |
98 <<<<<<< local |
99 two-point-five |
99 two-point-five |