diff options
| author | Andre Bossert <andre.bossert@siemens.com> | 2019-03-08 22:31:34 +0100 |
|---|---|---|
| committer | Andrey Loskutov <loskutov@gmx.de> | 2022-05-25 13:52:04 +0200 |
| commit | eaf4d500b886a7e776f50bf53497fe463e714b25 (patch) | |
| tree | 740ac70c01372243cdbc8c902113ff144c8f3c2b /org.eclipse.jgit.http.test/src | |
| parent | 85734356351ec2df4067b2472a37f6d9bcbb7350 (diff) | |
| download | jgit-eaf4d500b886a7e776f50bf53497fe463e714b25.tar.gz jgit-eaf4d500b886a7e776f50bf53497fe463e714b25.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit.http.test/src')
0 files changed, 0 insertions, 0 deletions