DESCRIPTION

https://bugs.eclipse.org/bugs/show_bug.cgi?id=356832

* added support for git mergetool
  * see: http://git-scm.com/docs/git-mergetool
  * new Git-Preferences in merge-group:
    * Merge tool to use:
      * Use Eclipse compare editor
      * Use default git merge tool
      * Use custom git merge tool
    * Custom merge tool: <toolname>
  * supported user config settings
    * merge.tool
    * mergetool.<tool>.path
    * mergetool.<tool>.cmd
    * mergetool.prompt
    * mergetool.trustExitCode
    * mergetool.writeToTemp
    * mergetool.keepTemporaries

* added support for git difftool (from user config)
  * see: http://git-scm.com/docs/git-difftool
  * new Git-Preferences in diff-group:
    * Diff tool to use:
      * Use Eclipse compare editor
      * Use default git diff tool
      * Use custom git diff tool
    * Custom diff tool: <toolname>
    * Bash path: <the path to bash> [only for windows, to be discussed]
  * supported user config settings
    * diff.tool
    * difftool.<tool>.path
    * difftool.<tool>.cmd
    * difftool.prompt
    * difftool.trustExitCode
    * difftool.writeToTemp [like mergetool, not seen in C-Git]
    * difftool.keepTemporaries [like mergetool, not seen in C-Git]

TODOs:
 * add / modify feature
   * add embedded diff/merge tool definitions like known in C-Git
   * merge.keepBackup
   * in case of "merge.trustExitCode" or if user wants add file to index
automatically
   * [to be discussed]: i've added execution of external tools for bash
(msys) for windows, to support execution of bash scripts under windows,
may be it should be removed and/or enabled only for windows...


Change-Id: If4000edaaf24ee31601aa5b718b07aca1d26a7ae
Signed-off-by: Genevieve Hudson xxx@xxx.xxx

COMMENTS

author: Genevieve Hudson
date: 2015-06-14 22:35:28.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2015-06-14 23:09:02.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/7125/

-------------------------------------
author: Brenden Conley
date: 2015-06-14 23:25:19.000000000

Patch Set 1: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/7125/ : SUCCESS

-------------------------------------
