| David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 1 | diff_cmd () { |
| David Aguilar | e2161bc | 2013-05-09 02:13:28 -0700 | [diff] [blame] | 2 | "$merge_tool_path" \ |
| David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 3 | --L1 "$MERGED (A)" --L2 "$MERGED (B)" \ |
| 4 | "$LOCAL" "$REMOTE" >/dev/null 2>&1 |
| 5 | } |
| 6 | |
| Fernando Ramos | 980145f | 2022-03-30 21:19:09 +0200 | [diff] [blame] | 7 | diff_cmd_help () { |
| 8 | echo "Use KDiff3 (requires a graphical session)" |
| 9 | } |
| 10 | |
| David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 11 | merge_cmd () { |
| 12 | if $base_present |
| 13 | then |
| 14 | "$merge_tool_path" --auto \ |
| 15 | --L1 "$MERGED (Base)" \ |
| 16 | --L2 "$MERGED (Local)" \ |
| 17 | --L3 "$MERGED (Remote)" \ |
| 18 | -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \ |
| 19 | >/dev/null 2>&1 |
| 20 | else |
| 21 | "$merge_tool_path" --auto \ |
| 22 | --L1 "$MERGED (Local)" \ |
| 23 | --L2 "$MERGED (Remote)" \ |
| 24 | -o "$MERGED" "$LOCAL" "$REMOTE" \ |
| 25 | >/dev/null 2>&1 |
| 26 | fi |
| David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 27 | } |
| David Aguilar | 7c10605 | 2016-11-29 01:38:07 -0800 | [diff] [blame] | 28 | |
| Fernando Ramos | 980145f | 2022-03-30 21:19:09 +0200 | [diff] [blame] | 29 | merge_cmd_help () { |
| 30 | echo "Use KDiff3 (requires a graphical session)" |
| 31 | } |
| 32 | |
| David Aguilar | 7c10605 | 2016-11-29 01:38:07 -0800 | [diff] [blame] | 33 | exit_code_trustable () { |
| 34 | true |
| 35 | } |
| Michael Schindler | 47eb4c6 | 2021-06-07 20:18:33 +0000 | [diff] [blame] | 36 | |
| 37 | translate_merge_tool_path() { |
| 38 | if type kdiff3 >/dev/null 2>/dev/null |
| 39 | then |
| 40 | echo kdiff3 |
| 41 | else |
| 42 | mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3" |
| 43 | fi |
| 44 | } |
