diff options
| author | Sebastian Schuberth <sschuberth@gmail.com> | 2012-08-10 10:21:06 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-10 08:08:08 -0700 |
| commit | 755e8b3f35e3991a735a6be740eda4567d45a741 (patch) | |
| tree | 309cbe2e12421c3e8d274c2133de1d04a97714f1 /git-mergetool--lib.sh | |
| parent | 7a30747fbacd9a2059e861cba80ebd67685ffe80 (diff) | |
| download | git-755e8b3f35e3991a735a6be740eda4567d45a741.tar.gz | |
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>
Diffstat (limited to 'git-mergetool--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index ed630b208a..0bbfcb1440 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -126,7 +126,7 @@ guess_merge_tool () { else tools="opendiff kdiff3 tkdiff xxdiff meld $tools" fi - tools="$tools gvimdiff diffuse ecmerge p4merge araxis bc3" + tools="$tools gvimdiff diffuse ecmerge p4merge araxis bc3 codecompare" fi case "${VISUAL:-$EDITOR}" in *vim*) |