Add Code Compare v2.80.4 as a merge / diff tool for Windows
authorSebastian Schuberth <sschuberth@gmail.com>
Fri, 10 Aug 2012 08:21:06 +0000 (10:21 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Aug 2012 15:08:08 +0000 (08:08 -0700)
commit755e8b3f35e3991a735a6be740eda4567d45a741
tree309cbe2e12421c3e8d274c2133de1d04a97714f1
parent7a30747fbacd9a2059e861cba80ebd67685ffe80
Add Code Compare v2.80.4 as a merge / diff tool for Windows

Code Compare is a commercial file comparison tool for Windows, see

    http://www.devart.com/codecompare/

Version 2.80.4 added support for command line arguments preceded by a
dash instead of a slash. This is required for Git for Windows because
slashes in command line arguments get mangled with according to these
rules:

    http://www.mingw.org/wiki/Posix_path_conversion

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash
git-mergetool--lib.sh
mergetools/codecompare [new file with mode: 0644]