Commit | Line | Data |
---|---|---|
bc7a96a8 DA |
1 | diff_cmd () { |
2 | "$merge_tool_path" "$LOCAL" "$REMOTE" | |
3 | } | |
4 | ||
5 | merge_cmd () { | |
6 | if $base_present | |
7 | then | |
8 | "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE" | |
9 | else | |
10 | "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE" | |
11 | fi | |
12 | } | |
7c10605d DA |
13 | |
14 | exit_code_trustable () { | |
15 | true | |
16 | } |