projects / thirdparty / git.git / blame
| 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 DA |
7 | case "$1" in |
| 8 | gvimdiff|vimdiff) | |
| 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 | ;; | |
| 18 | gvimdiff2|vimdiff2) | |
| 19 | "$merge_tool_path" -f -d -c 'wincmd l' \ | |
| 20 | "$LOCAL" "$MERGED" "$REMOTE" | |
| 21 | ;; | |
| 7c147b77 FC |
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 | ;; | |
| bc7a96a8 | 32 | esac |
| bc7a96a8 DA |
33 | } |
| 34 | ||
| 35 | translate_merge_tool_path() { | |
| 36 | case "$1" in | |
| 7c147b77 | 37 | gvimdiff|gvimdiff2|gvimdiff3) |
| bc7a96a8 DA |
38 | echo gvim |
| 39 | ;; | |
| 7c147b77 | 40 | vimdiff|vimdiff2|vimdiff3) |
| bc7a96a8 DA |
41 | echo vim |
| 42 | ;; | |
| 43 | esac | |
| 44 | } | |
| 29672844 DA |
45 | |
| 46 | exit_code_trustable () { | |
| 47 | true | |
| 48 | } | |
| 83bbf9b9 | 49 | |
| 50 | list_tool_variants () { | |
| 51 | for prefix in '' g; do | |
| 52 | for suffix in '' 2 3; do | |
| 53 | echo "${prefix}vimdiff${suffix}" | |
| 54 | done | |
| 55 | done | |
| 56 | } |