Commit | Line | Data |
---|---|---|
6ceb658c BR |
1 | diff_cmd () { |
2 | "$merge_tool_path" "$LOCAL" "$REMOTE" | |
3 | } | |
4 | ||
5 | merge_cmd () { | |
6 | if $base_present | |
7 | then | |
8 | "$merge_tool_path" -s "$LOCAL" \ | |
9 | "$REMOTE" "$BASE" "$MERGED" | |
10 | else | |
11 | "$merge_tool_path" -m "$LOCAL" \ | |
12 | "$REMOTE" "$MERGED" | |
13 | fi | |
14 | } | |
15 | ||
16 | exit_code_trustable () { | |
17 | true | |
18 | } |