blob: 10d86f3e19304125cecf06ddad928b9ffe2d0c08 [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
8 gvimdiff|vimdiff)
9 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 ;;
18 gvimdiff2|vimdiff2)
19 "$merge_tool_path" -f -d -c 'wincmd l' \
20 "$LOCAL" "$MERGED" "$REMOTE"
21 ;;
Felipe Contreras7c147b72014-04-20 19:24:20 -050022 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 Aguilarbc7a96a2011-08-18 00:23:46 -070032 esac
David Aguilarbc7a96a2011-08-18 00:23:46 -070033}
34
35translate_merge_tool_path() {
36 case "$1" in
Felipe Contreras7c147b72014-04-20 19:24:20 -050037 gvimdiff|gvimdiff2|gvimdiff3)
David Aguilarbc7a96a2011-08-18 00:23:46 -070038 echo gvim
39 ;;
Felipe Contreras7c147b72014-04-20 19:24:20 -050040 vimdiff|vimdiff2|vimdiff3)
David Aguilarbc7a96a2011-08-18 00:23:46 -070041 echo vim
42 ;;
43 esac
44}
David Aguilar29672842016-11-29 01:38:20 -080045
46exit_code_trustable () {
47 true
48}