tree a0baeaec840a4ef043606e5d8bbb8ca647ac2d40
parent f4069bb4ec39b0934ad0952427c2d9d31c76eec9
author Thomas Wolf <thomas.wolf@paranor.ch> 1619693903 +0200
committer Thomas Wolf <thomas.wolf@paranor.ch> 1620032364 +0200

Add git config for conflict style merge/diff3

Add a constant in ConfigConstants, and a ConflictStyle enum in
MergeCommand.

Change-Id: Idf8e036b6b6953bec06d6923a39e5ff30c2da562
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>