Show More
@@ -709,6 +709,39 b' Default is silent simplemerge:' | |||||
709 | # hg stat |
|
709 | # hg stat | |
710 | M f |
|
710 | M f | |
711 |
|
711 | |||
|
712 | premerge=keep keeps conflict markers in: | |||
|
713 | ||||
|
714 | $ beforemerge | |||
|
715 | [merge-tools] | |||
|
716 | false.whatever= | |||
|
717 | true.priority=1 | |||
|
718 | true.executable=cat | |||
|
719 | # hg update -C 1 | |||
|
720 | $ hg merge -r 4 --config merge-tools.true.premerge=keep | |||
|
721 | merging f | |||
|
722 | <<<<<<< local: ef83787e2614 - test: revision 1 | |||
|
723 | revision 1 | |||
|
724 | space | |||
|
725 | ======= | |||
|
726 | revision 4 | |||
|
727 | >>>>>>> other: 81448d39c9a0 - test: revision 4 | |||
|
728 | revision 0 | |||
|
729 | space | |||
|
730 | revision 4 | |||
|
731 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |||
|
732 | (branch merge, don't forget to commit) | |||
|
733 | $ aftermerge | |||
|
734 | # cat f | |||
|
735 | <<<<<<< local: ef83787e2614 - test: revision 1 | |||
|
736 | revision 1 | |||
|
737 | space | |||
|
738 | ======= | |||
|
739 | revision 4 | |||
|
740 | >>>>>>> other: 81448d39c9a0 - test: revision 4 | |||
|
741 | # hg stat | |||
|
742 | M f | |||
|
743 | ||||
|
744 | ||||
712 | Tool execution |
|
745 | Tool execution | |
713 |
|
746 | |||
714 | set tools.args explicit to include $base $local $other $output: |
|
747 | set tools.args explicit to include $base $local $other $output: |
General Comments 0
You need to be logged in to leave comments.
Login now