diff options
| author | Andre Bossert <andre.bossert@siemens.com> | 2019-03-08 21:32:57 +0100 |
|---|---|---|
| committer | Andrey Loskutov <loskutov@gmx.de> | 2022-05-25 13:50:50 +0200 |
| commit | 24171b05f0db8487d0a1dc40072cc313bb6e2087 (patch) | |
| tree | 9c139250d8c5e505f56a08d49179cd70c6146a23 /org.eclipse.jgit.ssh.apache/src/org/eclipse | |
| parent | b63c2f39a16f1607cc65e82c0271c8c29a6038f1 (diff) | |
| download | jgit-24171b05f0db8487d0a1dc40072cc313bb6e2087.tar.gz jgit-24171b05f0db8487d0a1dc40072cc313bb6e2087.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit.ssh.apache/src/org/eclipse')
0 files changed, 0 insertions, 0 deletions