blob: e72b06fc4d8ff76e06a0b972ae28df73efd4180d [file] [log] [blame]
Jacob Nisnevich35d62bb2016-03-25 16:17:57 -07001diff_cmd () {
2 "$merge_tool_path" "$LOCAL" "$REMOTE" -nh
3}
4
5merge_cmd () {
Jacob Nisnevich35d62bb2016-03-25 16:17:57 -07006 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
Jacob Nisnevich35d62bb2016-03-25 16:17:57 -070012}
13
14translate_merge_tool_path() {
15 mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
16}