David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 1 | diff_cmd () { |
David Aguilar | b2a6b71 | 2013-01-25 01:43:52 -0800 | [diff] [blame] | 2 | "$merge_tool_path" -R -f -d \ |
| 3 | -c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE" |
David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 4 | } |
| 5 | |
| 6 | merge_cmd () { |
David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 7 | case "$1" in |
| 8 | gvimdiff|vimdiff) |
| 9 | if $base_present |
| 10 | then |
Dickson Wong | 2300328 | 2016-01-28 18:18:14 -0800 | [diff] [blame] | 11 | "$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \ |
| 12 | "$LOCAL" "$BASE" "$REMOTE" "$MERGED" |
David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 13 | else |
| 14 | "$merge_tool_path" -f -d -c 'wincmd l' \ |
| 15 | "$LOCAL" "$MERGED" "$REMOTE" |
| 16 | fi |
| 17 | ;; |
| 18 | gvimdiff2|vimdiff2) |
| 19 | "$merge_tool_path" -f -d -c 'wincmd l' \ |
| 20 | "$LOCAL" "$MERGED" "$REMOTE" |
| 21 | ;; |
Felipe Contreras | 7c147b7 | 2014-04-20 19:24:20 -0500 | [diff] [blame] | 22 | gvimdiff3|vimdiff3) |
| 23 | if $base_present |
| 24 | then |
| 25 | "$merge_tool_path" -f -d -c 'hid | hid | hid' \ |
| 26 | "$LOCAL" "$REMOTE" "$BASE" "$MERGED" |
| 27 | else |
| 28 | "$merge_tool_path" -f -d -c 'hid | hid' \ |
| 29 | "$LOCAL" "$REMOTE" "$MERGED" |
| 30 | fi |
| 31 | ;; |
David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 32 | esac |
David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 33 | } |
| 34 | |
| 35 | translate_merge_tool_path() { |
| 36 | case "$1" in |
Felipe Contreras | 7c147b7 | 2014-04-20 19:24:20 -0500 | [diff] [blame] | 37 | gvimdiff|gvimdiff2|gvimdiff3) |
David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 38 | echo gvim |
| 39 | ;; |
Felipe Contreras | 7c147b7 | 2014-04-20 19:24:20 -0500 | [diff] [blame] | 40 | vimdiff|vimdiff2|vimdiff3) |
David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 41 | echo vim |
| 42 | ;; |
| 43 | esac |
| 44 | } |
David Aguilar | 2967284 | 2016-11-29 01:38:20 -0800 | [diff] [blame] | 45 | |
| 46 | exit_code_trustable () { |
| 47 | true |
| 48 | } |