OXIESEC PANEL
- Current Dir:
/
/
usr
/
lib
/
git-core
/
mergetools
Server IP: 139.59.38.164
Upload:
Create Dir:
Name
Size
Modified
Perms
📁
..
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📄
araxis
358 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
bc
367 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
bc3
24 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
codecompare
353 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
deltawalker
663 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
diffmerge
309 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
diffuse
248 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
ecmerge
306 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
emerge
438 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
examdiff
336 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
gvimdiff
29 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
gvimdiff2
29 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
gvimdiff3
29 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
kdiff3
522 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
kompare
117 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
meld
843 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
opendiff
267 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
p4merge
617 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
tkdiff
258 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
tortoisemerge
602 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
vimdiff
890 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
vimdiff2
29 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
vimdiff3
29 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
winmerge
361 bytes
04/26/2023 02:14:45 PM
rw-r--r--
📄
xxdiff
584 bytes
04/26/2023 02:14:45 PM
rw-r--r--
Editing: p4merge
Close
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" }