equal
deleted
inserted
replaced
34 $ hg commit -m branch2 |
34 $ hg commit -m branch2 |
35 created new head |
35 created new head |
36 |
36 |
37 $ hg merge 1 |
37 $ hg merge 1 |
38 merging a |
38 merging a |
39 warning: conflicts during merge. |
39 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
40 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
41 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
40 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
42 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
41 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
43 [1] |
42 [1] |
44 |
43 |
45 $ hg id |
44 $ hg id |
71 $ hg up -q --clean . |
70 $ hg up -q --clean . |
72 $ printf "\n[ui]\nmergemarkertemplate={author} {rev}\n" >> .hg/hgrc |
71 $ printf "\n[ui]\nmergemarkertemplate={author} {rev}\n" >> .hg/hgrc |
73 |
72 |
74 $ hg merge 1 |
73 $ hg merge 1 |
75 merging a |
74 merging a |
76 warning: conflicts during merge. |
75 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
77 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
78 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
76 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
79 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
77 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
80 [1] |
78 [1] |
81 |
79 |
82 $ cat a |
80 $ cat a |
103 > [ui] |
101 > [ui] |
104 > mergemarkertemplate={author} {rev}\nfoo\nbar\nbaz |
102 > mergemarkertemplate={author} {rev}\nfoo\nbar\nbaz |
105 > EOF |
103 > EOF |
106 |
104 |
107 $ hg -q merge 1 |
105 $ hg -q merge 1 |
108 warning: conflicts during merge. |
106 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
109 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
110 [1] |
107 [1] |
111 |
108 |
112 $ cat a |
109 $ cat a |
113 Small Mathematical Series. |
110 Small Mathematical Series. |
114 <<<<<<< local: test 2 |
111 <<<<<<< local: test 2 |
146 > [ui] |
143 > [ui] |
147 > mergemarkertemplate={desc|firstline} |
144 > mergemarkertemplate={desc|firstline} |
148 > EOF |
145 > EOF |
149 |
146 |
150 $ hg -q --encoding utf-8 merge 1 |
147 $ hg -q --encoding utf-8 merge 1 |
151 warning: conflicts during merge. |
148 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
152 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
153 [1] |
149 [1] |
154 |
150 |
155 $ cat a |
151 $ cat a |
156 Small Mathematical Series. |
152 Small Mathematical Series. |
157 <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc) |
153 <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc) |
174 $ hg up -q --clean 2 |
170 $ hg up -q --clean 2 |
175 $ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc |
171 $ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc |
176 |
172 |
177 $ hg merge 1 |
173 $ hg merge 1 |
178 merging a |
174 merging a |
179 warning: conflicts during merge. |
175 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
180 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
181 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
176 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
182 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
177 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
183 [1] |
178 [1] |
184 |
179 |
185 $ cat a |
180 $ cat a |
203 |
198 |
204 $ hg up -q --clean . |
199 $ hg up -q --clean . |
205 |
200 |
206 $ hg merge 1 --tool internal:merge3 |
201 $ hg merge 1 --tool internal:merge3 |
207 merging a |
202 merging a |
208 warning: conflicts during merge. |
203 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
209 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
210 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
204 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
211 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
205 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
212 [1] |
206 [1] |
213 $ cat a |
207 $ cat a |
214 Small Mathematical Series. |
208 Small Mathematical Series. |
249 |
243 |
250 Now test :merge-other and :merge-local |
244 Now test :merge-other and :merge-local |
251 |
245 |
252 $ hg merge |
246 $ hg merge |
253 merging a |
247 merging a |
254 warning: conflicts during merge. |
248 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
255 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
256 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
249 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
257 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
250 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
258 [1] |
251 [1] |
259 $ hg resolve --tool :merge-other a |
252 $ hg resolve --tool :merge-other a |
260 merging a |
253 merging a |