| Sebastian Schuberth | 755e8b3 | 2012-08-10 10:21:06 +0200 | [diff] [blame] | 1 | diff_cmd () { |
| 2 | "$merge_tool_path" "$LOCAL" "$REMOTE" |
| 3 | } |
| 4 | |
| 5 | merge_cmd () { |
| Sebastian Schuberth | 755e8b3 | 2012-08-10 10:21:06 +0200 | [diff] [blame] | 6 | if $base_present |
| 7 | then |
| 8 | "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \ |
| 9 | -RF="$MERGED" |
| 10 | else |
| 11 | "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \ |
| 12 | -RF="$MERGED" |
| 13 | fi |
| Sebastian Schuberth | 755e8b3 | 2012-08-10 10:21:06 +0200 | [diff] [blame] | 14 | } |
| 15 | |
| 16 | translate_merge_tool_path() { |
| 17 | if merge_mode |
| 18 | then |
| 19 | echo CodeMerge |
| 20 | else |
| 21 | echo CodeCompare |
| 22 | fi |
| 23 | } |
