diff_cmd () { empty_file= # p4merge does not like /dev/null if test "/dev/null" = "$LOCAL" then LOCAL="$(create_empty_file)" fi if test "/dev/null" = "$REMOTE" then REMOTE="$(create_empty_file)" fi "$merge_tool_path" "$LOCAL" "$REMOTE" if test -n "$empty_file" then rm -f "$empty_file" fi } merge_cmd () { if ! $base_present then cp -- "$LOCAL" "$BASE" create_virtual_base "$BASE" "$REMOTE" fi "$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED" } create_empty_file () { empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$" >"$empty_file" printf "%s" "$empty_file" }
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 |
|