Mercurial > hg
comparison doc/hgrc.5.txt @ 11146:523330d567cf
merge: tool.premerge=keep will leave premerge markers in $local
author | David Champion <dgc@uchicago.edu> |
---|---|
date | Wed, 21 Apr 2010 11:57:45 -0500 |
parents | b3a1f535ce4f |
children | a912f26777d3 |
comparison
equal
deleted
inserted
replaced
11145:06586648eeec | 11146:523330d567cf |
---|---|
452 files being merged as well as the output file through these | 452 files being merged as well as the output file through these |
453 variables: ``$base``, ``$local``, ``$other``, ``$output``. | 453 variables: ``$base``, ``$local``, ``$other``, ``$output``. |
454 Default: ``$local $base $other`` | 454 Default: ``$local $base $other`` |
455 ``premerge`` | 455 ``premerge`` |
456 Attempt to run internal non-interactive 3-way merge tool before | 456 Attempt to run internal non-interactive 3-way merge tool before |
457 launching external tool. | 457 launching external tool. Options are ``true``, ``false``, or ``keep`` |
458 to leave markers in the file if the premerge fails. | |
458 Default: True | 459 Default: True |
459 ``binary`` | 460 ``binary`` |
460 This tool can merge binary files. Defaults to False, unless tool | 461 This tool can merge binary files. Defaults to False, unless tool |
461 was selected by file pattern match. | 462 was selected by file pattern match. |
462 ``symlink`` | 463 ``symlink`` |