tree 3f0d2bb807b23a367d3e19f9b5c6ef7aba329bfb
parent 490ed19fc73522265027ea377ff745289160d21f
author Jason Krause <weltraumheld@gmail.com> 1770102772 +0100
committer Matthias Sohn <matthias.sohn@sap.com> 1771973100 +0000

Support diff3 conflict style in merges

Add conflict style setters to commands that can produce
merge conflicts and default to merge.conflictStyle from
the Git config. Propagate the setting into the merger
and select the appropriate formatter in ResolveMerger.

Activate existing diff3 support and add tests for the new behavior.

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=442284
Change-Id: Ic201492b2f086712d61fa61dc2c53fcbe5de46b3