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	Enable compiler option --release	2021-09-29 17:13:01 +02:00
META-INF	Add command line support for "git mergetool"	2022-05-25 13:52:04 +02:00
resources	Add mergetool merge feature (execute external tool)	2022-05-25 13:52:04 +02: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
.gitignore	Finish removing Apache Felix maven-bundle-plugin	2010-01-12 11:46:55 -08:00
.project	Enforce the use of Java5 API:s only (with a few exceptions)	2011-12-16 01:01:36 +01:00
BUILD	Decouple JSch from JGit Core	2020-06-01 01:46:59 +02:00
about.html	Add missing about.html files to all shipped bundles	2011-06-08 21:51:51 +02:00
build.properties	Use slf4j-simple instead of log4j for logging	2021-12-31 01:09:52 +01:00
jgit.sh	Enable passing java options to jgit command line executable	2020-04-28 13:57:42 +02:00
plugin.properties	Fix bundle localization of Apache SSH bundle	2019-06-21 17:54:06 +02:00
pom.xml	Prepare 6.2.0-SNAPSHOT builds	2022-03-03 10:49:58 +01:00