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	[pgm tests] Relax version constraints for hamcrest	2022-03-30 16:26:57 -04:00
src/org/eclipse/jgit	Update EDL 1.0 license headers to new short SPDX compliant format	2020-01-04 01:10:05 +01:00
tst/org/eclipse/jgit/pgm	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	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
.project	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
BUILD	Bazel: Remove superfluous dependencies flagged by unused_deps	2020-05-22 17:48:19 +02:00
about.html	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
build.properties	Add missing resources from source.. in build.properties	2013-10-30 17:42:38 +01:00
org.eclipse.jgit.pgm--All-Tests (Java11) (de).launch	Bump minimum required Java version to 11	2021-09-29 17:12:12 +02:00
org.eclipse.jgit.pgm--All-Tests (Java11).launch	Bump minimum required Java version to 11	2021-09-29 17:12:12 +02:00
org.eclipse.jgit.pgm--All-Tests.launch	Add the other test launchers as favorites	2013-06-16 23:33:29 +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