* Added setting to Git preferences to enable or disable 'Add external * Add external merged file to the index (after a successful merge

* Added support for tool option without $BASE file

* Added embedded diff/merge tool definitions like known in C-Git * Show message about failed tool execution to user was triggered in the EGit UI (parameters, exceptions, dialogs, auto-add-to-index after mergetool run etc.) (code reuse from change) * difftool.keepTemporaries ġ.2 find a place where the configured tools can be executed -> platform independent, not like it's done now in EGit change with needed path to Bash / Windows MinGW / Git Bash, see comment 'Bash path: ' -> use the JGit infrastructure also used for Git Hooks execution -> it should handle how start with command-line interpreter etc., needed for shell-scripts under Windows.ġ.3 implement command line usage like 'git difftool' or 'git mergetool' in JGitġ.4 write tests for config read, checks, exceptions etc.Ģ.1 refactor EGit changes to use the new JGit API for read the configured diff/merge-tools and show them in preferences (code reuse from change)Ģ.2 running the tools with new JGit API if compare or merge etc. The steps i did, briefly (also see the EGit change description for the settings).ġ.1 find a place in JGit where the git-config(s) can be read and store them to new classes / instances introduced in the EGit change (code reuse from change): Anyway i will inform here about the status. Andrey, i will prepare my not yet finished patches for JGit, hopefully during this weekend, and push them to new Gerrit change.

Use winmerge git bash