Subject: [PATCH 0/2 v2] Adding Beyond Compare as a merge tool

From: Sebastian Schuberth <[email-masked]>
Date: Sun, 27 Feb 2011 12:28:28 +0100

This is the second iteration of the series to add Beyond Compare as a merge tool as an alternative to

cp/mergetool-beyondcompare 

It replaces calling "BCompare" with "bcompare". While the first is the correct binary name, the latter is the name of the wrapper script to start Beyond Compare on Linux. On Windows, this change does not matter, as Windows is case-insensitive.

Moreover, the third patch in the series has been dropped for similar reasons. While the binary for ECMerge is called "guimerge", the link in /usr/local/bin is called "ecmerge". There is no "ecmerge" executable on Windows, but Windows users need to set mergetool.ecmerge.path anyway, and just specify the path to "guimerge" here.

Sebastian Schuberth (2):
  mergetool--lib: Sort tools alphabetically for easier lookup
  mergetool--lib: Add Beyond Compare 3 as a tool

 Documentation/git-difftool.txt         |    4 +-
 Documentation/git-mergetool.txt        |    4 +-
 Documentation/merge-config.txt         |    8 +-
 contrib/completion/git-completion.bash |    2 +-
 git-gui/lib/mergetool.tcl              |  101 +++++++------
 git-mergetool--lib.sh                  |  247 +++++++++++++++++---------------
 6 files changed, 195 insertions(+), 171 deletions(-)

-- 
1.7.3.2.msysgit.6.dirty