Skip to content

Commit 35d62bb

Browse files
jacobnisnevichgitster
authored andcommitted
mergetools: add support for ExamDiff
Signed-off-by: Jacob Nisnevich <[email protected]> Acked-by: David Aguilar <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e36d716 commit 35d62bb

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

mergetools/examdiff

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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+
}

0 commit comments

Comments
 (0)