| David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 1 | diff_cmd () { |
| 2 | "$merge_tool_path" "$LOCAL" "$REMOTE" |
| 3 | } |
| 4 | |
| Fernando Ramos | 980145f | 2022-03-30 21:19:09 +0200 | [diff] [blame] | 5 | diff_cmd_help () { |
| 6 | echo "Use TkDiff (requires a graphical session)" |
| 7 | } |
| 8 | |
| David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 9 | merge_cmd () { |
| 10 | if $base_present |
| 11 | then |
| 12 | "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE" |
| 13 | else |
| 14 | "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE" |
| 15 | fi |
| 16 | } |
| David Aguilar | 7c10605 | 2016-11-29 01:38:07 -0800 | [diff] [blame] | 17 | |
| 18 | exit_code_trustable () { |
| 19 | true |
| 20 | } |
| Fernando Ramos | 980145f | 2022-03-30 21:19:09 +0200 | [diff] [blame] | 21 | |
| 22 | merge_cmd_help () { |
| 23 | echo "Use TkDiff (requires a graphical session)" |
| 24 | } |
