blob: 96f6209a04106fbe8b66e30d5fefd0c8e92fb685 [file] [log] [blame]
David Aguilarbc7a96a2011-08-18 00:23:46 -07001diff_cmd () {
David Aguilarb2a6b712013-01-25 01:43:52 -08002 "$merge_tool_path" -R -f -d \
3 -c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
David Aguilarbc7a96a2011-08-18 00:23:46 -07004}
5
6merge_cmd () {
David Aguilarbc7a96a2011-08-18 00:23:46 -07007 case "$1" in
pudinha11868972020-07-29 22:31:13 +01008 *vimdiff)
David Aguilarbc7a96a2011-08-18 00:23:46 -07009 if $base_present
10 then
Dickson Wong23003282016-01-28 18:18:14 -080011 "$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
12 "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
David Aguilarbc7a96a2011-08-18 00:23:46 -070013 else
14 "$merge_tool_path" -f -d -c 'wincmd l' \
15 "$LOCAL" "$MERGED" "$REMOTE"
16 fi
17 ;;
Seth House30bb8082021-02-13 19:28:40 -070018 *vimdiff1)
19 "$merge_tool_path" -f -d \
20 -c 'echon "Resolve conflicts leftward then save. Use :cq to abort."' \
21 "$LOCAL" "$REMOTE"
22 ret="$?"
23 if test "$ret" -eq 0
24 then
25 cp -- "$LOCAL" "$MERGED"
26 fi
27 return "$ret"
28 ;;
pudinha11868972020-07-29 22:31:13 +010029 *vimdiff2)
David Aguilarbc7a96a2011-08-18 00:23:46 -070030 "$merge_tool_path" -f -d -c 'wincmd l' \
31 "$LOCAL" "$MERGED" "$REMOTE"
32 ;;
pudinha11868972020-07-29 22:31:13 +010033 *vimdiff3)
Felipe Contreras7c147b72014-04-20 19:24:20 -050034 if $base_present
35 then
36 "$merge_tool_path" -f -d -c 'hid | hid | hid' \
37 "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
38 else
39 "$merge_tool_path" -f -d -c 'hid | hid' \
40 "$LOCAL" "$REMOTE" "$MERGED"
41 fi
42 ;;
David Aguilarbc7a96a2011-08-18 00:23:46 -070043 esac
David Aguilarbc7a96a2011-08-18 00:23:46 -070044}
45
46translate_merge_tool_path() {
47 case "$1" in
pudinha11868972020-07-29 22:31:13 +010048 nvimdiff*)
49 echo nvim
50 ;;
51 gvimdiff*)
David Aguilarbc7a96a2011-08-18 00:23:46 -070052 echo gvim
53 ;;
pudinha11868972020-07-29 22:31:13 +010054 vimdiff*)
David Aguilarbc7a96a2011-08-18 00:23:46 -070055 echo vim
56 ;;
57 esac
58}
David Aguilar29672842016-11-29 01:38:20 -080059
60exit_code_trustable () {
61 true
62}
pudinha83bbf9b2020-07-29 22:31:12 +010063
64list_tool_variants () {
pudinha11868972020-07-29 22:31:13 +010065 for prefix in '' g n; do
Seth House30bb8082021-02-13 19:28:40 -070066 for suffix in '' 1 2 3; do
pudinha83bbf9b2020-07-29 22:31:12 +010067 echo "${prefix}vimdiff${suffix}"
68 done
69 done
70}