Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/configitems.py @ 34796:ed91846c29cf
filemerge: introduce functions to halt merge flow
Depends on D931.
This patch introduces functions and a config option that will allow a user
to halt the merge if there are failures during a file merge. These functions
will be used in the next patch.
Differential Revision: https://phab.mercurial-scm.org/D932
| author | Ryan McElroy <rmcelroy@fb.com> |
|---|---|
| date | Fri, 06 Oct 2017 06:48:43 -0700 |
| parents | 48d2b396cf6c |
| children | c4a0480d1951 |
comparison
equal
deleted
inserted
replaced
| 34795:530b7361e3a9 | 34796:ed91846c29cf |
|---|---|
| 529 default='abort', | 529 default='abort', |
| 530 ) | 530 ) |
| 531 coreconfigitem('merge', 'followcopies', | 531 coreconfigitem('merge', 'followcopies', |
| 532 default=True, | 532 default=True, |
| 533 ) | 533 ) |
| 534 coreconfigitem('merge', 'on-failure', | |
| 535 default='continue', | |
| 536 ) | |
| 534 coreconfigitem('merge', 'preferancestor', | 537 coreconfigitem('merge', 'preferancestor', |
| 535 default=lambda: ['*'], | 538 default=lambda: ['*'], |
| 536 ) | 539 ) |
| 537 coreconfigitem('pager', 'attend-.*', | 540 coreconfigitem('pager', 'attend-.*', |
| 538 default=dynamicdefault, | 541 default=dynamicdefault, |