| 1 | diff_cmd () { |
| 2 | "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 |
| 3 | } |
| 4 | |
| 5 | diff_cmd_help () { |
| 6 | echo "Use DiffMerge (requires a graphical session)" |
| 7 | } |
| 8 | |
| 9 | merge_cmd () { |
| 10 | if $base_present |
| 11 | then |
| 12 | "$merge_tool_path" --merge --result="$MERGED" \ |
| 13 | "$LOCAL" "$BASE" "$REMOTE" |
| 14 | else |
| 15 | "$merge_tool_path" --merge \ |
| 16 | --result="$MERGED" "$LOCAL" "$REMOTE" |
| 17 | fi |
| 18 | } |
| 19 | |
| 20 | merge_cmd_help () { |
| 21 | echo "Use DiffMerge (requires a graphical session)" |
| 22 | } |
| 23 | |
| 24 | exit_code_trustable () { |
| 25 | true |
| 26 | } |