diff_cmd () { "$merge_tool_path" -R -f -d \ -c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE" } merge_cmd () { case "$1" in gvimdiff|vimdiff) if $base_present then "$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \ "$LOCAL" "$BASE" "$REMOTE" "$MERGED" else "$merge_tool_path" -f -d -c 'wincmd l' \ "$LOCAL" "$MERGED" "$REMOTE" fi ;; gvimdiff2|vimdiff2) "$merge_tool_path" -f -d -c 'wincmd l' \ "$LOCAL" "$MERGED" "$REMOTE" ;; gvimdiff3|vimdiff3) if $base_present then "$merge_tool_path" -f -d -c 'hid | hid | hid' \ "$LOCAL" "$REMOTE" "$BASE" "$MERGED" else "$merge_tool_path" -f -d -c 'hid | hid' \ "$LOCAL" "$REMOTE" "$MERGED" fi ;; esac } translate_merge_tool_path() { case "$1" in gvimdiff|gvimdiff2|gvimdiff3) echo gvim ;; vimdiff|vimdiff2|vimdiff3) echo vim ;; esac } exit_code_trustable () { true }
Name | Type | Size | Permission | Actions |
---|---|---|---|---|
araxis | File | 358 B | 0644 |
|
bc | File | 367 B | 0644 |
|
bc3 | File | 24 B | 0644 |
|
codecompare | File | 353 B | 0644 |
|
deltawalker | File | 663 B | 0644 |
|
diffmerge | File | 309 B | 0644 |
|
diffuse | File | 248 B | 0644 |
|
ecmerge | File | 306 B | 0644 |
|
emerge | File | 438 B | 0644 |
|
examdiff | File | 336 B | 0644 |
|
gvimdiff | File | 29 B | 0644 |
|
gvimdiff2 | File | 29 B | 0644 |
|
gvimdiff3 | File | 29 B | 0644 |
|
kdiff3 | File | 522 B | 0644 |
|
kompare | File | 117 B | 0644 |
|
meld | File | 843 B | 0644 |
|
opendiff | File | 267 B | 0644 |
|
p4merge | File | 617 B | 0644 |
|
tkdiff | File | 258 B | 0644 |
|
tortoisemerge | File | 602 B | 0644 |
|
vimdiff | File | 890 B | 0644 |
|
vimdiff2 | File | 29 B | 0644 |
|
vimdiff3 | File | 29 B | 0644 |
|
winmerge | File | 361 B | 0644 |
|
xxdiff | File | 584 B | 0644 |
|