equal
deleted
inserted
replaced
194 ======= |
194 ======= |
195 f2 |
195 f2 |
196 >>>>>>> merge rev: 8c217da987be - test: a b c d e f2 |
196 >>>>>>> merge rev: 8c217da987be - test: a b c d e f2 |
197 |
197 |
198 |
198 |
|
199 Filesets can be used to select which files to run partial merge tools on. |
|
200 |
|
201 $ hg up -C 4 |
|
202 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
203 $ hg merge 3 -t :merge3 --config partial-merge-tools.head.patterns=set:other |
|
204 merging file |
|
205 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
|
206 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
207 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
208 [1] |
|
209 $ cat file |
|
210 b |
|
211 c |
|
212 d |
|
213 e |
|
214 <<<<<<< working copy: d57edaa6e21a - test: a b c d e f3 |
|
215 f3 |
|
216 ||||||| common ancestor: 8ae8bb9cc43a - test: a b c d e f |
|
217 f |
|
218 ======= |
|
219 f2 |
|
220 >>>>>>> merge rev: 8c217da987be - test: a b c d e f2 |
|
221 |
|
222 |
199 If there are several matching tools, they are run in requested order. We move |
223 If there are several matching tools, they are run in requested order. We move |
200 `head` after `tail` in order here so it has no effect (the conflict in "f" thus |
224 `head` after `tail` in order here so it has no effect (the conflict in "f" thus |
201 remains). |
225 remains). |
202 |
226 |
203 $ hg up -C 4 |
227 $ hg up -C 4 |