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>
Jacob Nisnevich committed
Mar 25, 2016 at 16:17 UTC
35d62bbe3e9ec6388f8f4077c3c6c0767e8d984b
1 file changed
+18
mergetools/examdiff
new
+18
@@ -0,0 +1,18 @@
1
+diff_cmd () {
2
+ "$merge_tool_path" "$LOCAL" "$REMOTE" -nh
3
+}
4
+
5
+merge_cmd () {
6
+ touch "$BACKUP"
7
+ if $base_present
8
+ then
9
+ "$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
10
+ else
11
+ "$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
12
+ fi
13
+ check_unchanged
14
+}
15
+
16
+translate_merge_tool_path() {
17
+ mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
18
+}