Andre Bossert eaf4d500b8 Add mergetool merge feature (execute external tool) ... see: https://git-scm.com/docs/git-mergetool * implement mergetool merge function (execute external tool) * add ExecutionResult and commandExecutionError to ToolException * handle "base not present" case (empty or null base file path) * handle deleted (rm) and modified (add) conflicts * handle settings * keepBackup * keepTemporaries * writeToTemp Bug: 356832 Change-Id: Id323c2fcb1c24d12ceb299801df8bac51a6d463f Signed-off-by: Andre Bossert <andre.bossert@siemens.com>		2022-05-25 13:52:04 +02:00
..
.settings	[checkout] Use .gitattributes from the commit to be checked out	2022-03-07 18:45:25 +01:00
META-INF	Prepare 6.1.1-SNAPSHOT builds	2022-03-08 17:04:10 +01:00
findBugs	[spotbugs] Silence NP_BOOLEAN_RETURN_NULL in IgnoreNode#checkIgnored	2020-12-22 10:52:59 +01:00
resources/org/eclipse/jgit	Fetch: Introduce negative refspecs.	2022-04-13 10:21:20 -07:00
src/org/eclipse/jgit	Add mergetool merge feature (execute external tool)	2022-05-25 13:52:04 +02:00
.classpath	Bump minimum required Java version to 11	2021-09-29 17:12:12 +02:00
.fbprefs	…
.gitignore	…
.project	…
BUILD	Fix stamping to produce stable file timestamps	2020-12-14 15:45:29 +01:00
about.html	…
build.properties	…
plugin.properties	Fix bundle localization of Apache SSH bundle	2019-06-21 17:54:06 +02:00
pom.xml	Prepare 6.1.1-SNAPSHOT builds	2022-03-08 17:04:10 +01:00