summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorSebastian Schuberth <sschuberth@gmail.com>2012-08-10 08:21:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-10 15:08:08 (GMT)
commit755e8b3f35e3991a735a6be740eda4567d45a741 (patch)
tree309cbe2e12421c3e8d274c2133de1d04a97714f1 /mergetools
parent7a30747fbacd9a2059e861cba80ebd67685ffe80 (diff)
downloadgit-755e8b3f35e3991a735a6be740eda4567d45a741.zip
git-755e8b3f35e3991a735a6be740eda4567d45a741.tar.gz
git-755e8b3f35e3991a735a6be740eda4567d45a741.tar.bz2
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 'mergetools')
-rw-r--r--mergetools/codecompare25
1 files changed, 25 insertions, 0 deletions
diff --git a/mergetools/codecompare b/mergetools/codecompare
new file mode 100644
index 0000000..3f0486b
--- /dev/null
+++ b/mergetools/codecompare
@@ -0,0 +1,25 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+ touch "$BACKUP"
+ if $base_present
+ then
+ "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
+ -RF="$MERGED"
+ else
+ "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
+ -RF="$MERGED"
+ fi
+ check_unchanged
+}
+
+translate_merge_tool_path() {
+ if merge_mode
+ then
+ echo CodeMerge
+ else
+ echo CodeCompare
+ fi
+}