Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint
[git] / mergetools / examdiff
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 }