Merge branch 'js/bs-is-a-dir-sep-on-windows'
[git] / mergetools / examdiff
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE" -nh
3 }
4
5 merge_cmd () {
6         if $base_present
7         then
8                 "$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
9         else
10                 "$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
11         fi
12 }
13
14 translate_merge_tool_path() {
15         mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
16 }