]>
Commit | Line | Data |
---|---|---|
bc7a96a8 | 1 | diff_cmd () { |
b2a6b712 DA |
2 | "$merge_tool_path" -R -f -d \ |
3 | -c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE" | |
bc7a96a8 DA |
4 | } |
5 | ||
6 | merge_cmd () { | |
bc7a96a8 | 7 | case "$1" in |
11868978 | 8 | *vimdiff) |
bc7a96a8 DA |
9 | if $base_present |
10 | then | |
2300328c DW |
11 | "$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \ |
12 | "$LOCAL" "$BASE" "$REMOTE" "$MERGED" | |
bc7a96a8 DA |
13 | else |
14 | "$merge_tool_path" -f -d -c 'wincmd l' \ | |
15 | "$LOCAL" "$MERGED" "$REMOTE" | |
16 | fi | |
17 | ;; | |
11868978 | 18 | *vimdiff2) |
bc7a96a8 DA |
19 | "$merge_tool_path" -f -d -c 'wincmd l' \ |
20 | "$LOCAL" "$MERGED" "$REMOTE" | |
21 | ;; | |
11868978 | 22 | *vimdiff3) |
7c147b77 FC |
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 | ;; | |
bc7a96a8 | 32 | esac |
bc7a96a8 DA |
33 | } |
34 | ||
35 | translate_merge_tool_path() { | |
36 | case "$1" in | |
11868978 | 37 | nvimdiff*) |
38 | echo nvim | |
39 | ;; | |
40 | gvimdiff*) | |
bc7a96a8 DA |
41 | echo gvim |
42 | ;; | |
11868978 | 43 | vimdiff*) |
bc7a96a8 DA |
44 | echo vim |
45 | ;; | |
46 | esac | |
47 | } | |
29672844 DA |
48 | |
49 | exit_code_trustable () { | |
50 | true | |
51 | } | |
83bbf9b9 | 52 | |
53 | list_tool_variants () { | |
11868978 | 54 | for prefix in '' g n; do |
83bbf9b9 | 55 | for suffix in '' 2 3; do |
56 | echo "${prefix}vimdiff${suffix}" | |
57 | done | |
58 | done | |
59 | } |