--- a/tests/test-merge-tools.t Mon Aug 04 16:58:39 2014 -0700
+++ b/tests/test-merge-tools.t Mon Aug 04 16:32:41 2014 -0700
@@ -741,6 +741,44 @@
# hg stat
M f
+premerge=keep-merge3 keeps conflict markers with base content:
+
+ $ beforemerge
+ [merge-tools]
+ false.whatever=
+ true.priority=1
+ true.executable=cat
+ # hg update -C 1
+ $ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3
+ merging f
+ <<<<<<< local: ef83787e2614 - test: revision 1
+ revision 1
+ space
+ ||||||| base
+ revision 0
+ space
+ =======
+ revision 4
+ >>>>>>> other: 81448d39c9a0 - test: revision 4
+ revision 0
+ space
+ revision 4
+ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
+ $ aftermerge
+ # cat f
+ <<<<<<< local: ef83787e2614 - test: revision 1
+ revision 1
+ space
+ ||||||| base
+ revision 0
+ space
+ =======
+ revision 4
+ >>>>>>> other: 81448d39c9a0 - test: revision 4
+ # hg stat
+ M f
+
Tool execution