Commit | Line | Data |
---|---|---|
eb12adc7 DA |
1 | diff_cmd () { |
2 | "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED" | |
3 | } | |
4 | ||
5 | merge_cmd () { | |
6 | if $base_present | |
7 | then | |
8 | "$merge_tool_path" mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED" | |
9 | else | |
10 | "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED" | |
11 | fi | |
12 | } |