| 1 | diff_cmd () { |
| 2 | "$merge_tool_path" "$LOCAL" "$REMOTE" -nh |
| 3 | } |
| 4 | |
| 5 | diff_cmd_help () { |
| 6 | echo "Use ExamDiff Pro (requires a graphical session)" |
| 7 | } |
| 8 | |
| 9 | merge_cmd () { |
| 10 | if $base_present |
| 11 | then |
| 12 | "$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh |
| 13 | else |
| 14 | "$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh |
| 15 | fi |
| 16 | } |
| 17 | |
| 18 | merge_cmd_help () { |
| 19 | echo "Use ExamDiff Pro (requires a graphical session)" |
| 20 | } |
| 21 | |
| 22 | translate_merge_tool_path() { |
| 23 | mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro" |
| 24 | } |