]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f4069bb) | patch
Add git config for conflict style merge/diff3 18/180118/1
authorThomas Wolf <thomas.wolf@paranor.ch>
Thu, 29 Apr 2021 10:58:23 +0000 (12:58 +0200)
committerThomas Wolf <thomas.wolf@paranor.ch>
Mon, 3 May 2021 08:59:24 +0000 (10:59 +0200)
commite58bf0870e069fc758d1d9c83b83b8ab80929f34
treea0baeaec840a4ef043606e5d8bbb8ca647ac2d40tree | snapshot
parentf4069bb4ec39b0934ad0952427c2d9d31c76eec9commit | diff
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>
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit