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
..
org/eclipse/jgit/pgm/internal	Add mergetool merge feature (execute external tool)	2022-05-25 13:52:04 +02:00
simplelogger.properties	Use slf4j-simple instead of log4j for logging	2021-12-31 01:09:52 +01:00