]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b63c2f3) | patch
Add config reader for user-defined mergetools 42/137942/40
authorAndre Bossert <andre.bossert@siemens.com>
Fri, 8 Mar 2019 20:32:57 +0000 (21:32 +0100)
committerAndrey Loskutov <loskutov@gmx.de>
Wed, 25 May 2022 11:50:50 +0000 (13:50 +0200)
commit24171b05f0db8487d0a1dc40072cc313bb6e2087
tree9c139250d8c5e505f56a08d49179cd70c6146a23tree | snapshot
parentb63c2f39a16f1607cc65e82c0271c8c29a6038f1commit | diff
Add config reader for user-defined mergetools

see: https://git-scm.com/docs/git-mergetool
see: https://git-scm.com/docs/git-config

* add config reader for user-defined mergetools
  * merge.tool
  * merge.guitool
  * mergetool.prompt
  * mergetool.keepBackup
  * mergetool.keepTemporaries
  * mergetool.writeToTemp
  * mergetool.<tool>.path
  * mergetool.<tool>.cmd
  * mergetool.<tool>.trustExitCode

Bug: 356832
Change-Id: Ic4f07376630713d8e06cbad284d9c72c9ecc0405
Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalMergeToolTest.java [new file with mode: 0644] blob
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalMergeTool.java [new file with mode: 0644] blob
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeToolConfig.java [new file with mode: 0644] blob
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeTools.java [new file with mode: 0644] blob
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/UserDefinedMergeTool.java [new file with mode: 0644] blob
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