summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorJacob Nisnevich <jacob.nisnevich@gmail.com>2016-03-25 23:17:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-04 16:15:14 (GMT)
commit35d62bbe3e9ec6388f8f4077c3c6c0767e8d984b (patch)
tree76de42aeff430ff2fc56e55acc784c9a9c6e757d /mergetools
parente36d716751d3477694325e1ff2ece33747133a5b (diff)
downloadgit-35d62bbe3e9ec6388f8f4077c3c6c0767e8d984b.zip
git-35d62bbe3e9ec6388f8f4077c3c6c0767e8d984b.tar.gz
git-35d62bbe3e9ec6388f8f4077c3c6c0767e8d984b.tar.bz2
mergetools: add support for ExamDiff
Signed-off-by: Jacob Nisnevich <jacob.nisnevich@gmail.com> Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
-rw-r--r--mergetools/examdiff18
1 files changed, 18 insertions, 0 deletions
diff --git a/mergetools/examdiff b/mergetools/examdiff
new file mode 100644
index 0000000..7b524d4
--- /dev/null
+++ b/mergetools/examdiff
@@ -0,0 +1,18 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE" -nh
+}
+
+merge_cmd () {
+ touch "$BACKUP"
+ if $base_present
+ then
+ "$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
+ else
+ "$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
+ fi
+ check_unchanged
+}
+
+translate_merge_tool_path() {
+ mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
+}