Mercurial > hg
comparison doc/hgrc.5.txt @ 11149:d3c1eddfdbcf
merge: tool.check = prompt will force an interactive merge check
tool.check = prompt can be used when the exit status of a merge
tool is unreliable but an explicit user signoff on the merge result is
acceptable.
author | David Champion <dgc@uchicago.edu> |
---|---|
date | Mon, 10 May 2010 11:04:56 -0500 |
parents | a912f26777d3 |
children | e7adcef1504b |
comparison
equal
deleted
inserted
replaced
11148:a912f26777d3 | 11149:d3c1eddfdbcf |
---|---|
468 | 468 |
469 ``changed`` | 469 ``changed`` |
470 Ask whether merge was successful when the merged file shows no changes. | 470 Ask whether merge was successful when the merged file shows no changes. |
471 ``conflicts`` | 471 ``conflicts`` |
472 Check whether there are conflicts even though the tool reported success. | 472 Check whether there are conflicts even though the tool reported success. |
473 ``prompt`` | |
474 Always prompt for merge success, regardless of success reported by tool. | |
473 | 475 |
474 ``checkchanged`` | 476 ``checkchanged`` |
475 True is equivalent to ``check = changed``. | 477 True is equivalent to ``check = changed``. |
476 Default: False | 478 Default: False |
477 ``checkconflicts`` | 479 ``checkconflicts`` |