OXIESEC PANEL
- Current Dir:
/
/
usr
/
lib
/
git-core
/
mergetools
Server IP: 10.0.0.4
Upload:
Create Dir:
Name
Size
Modified
Perms
📁
..
-
11/20/2022 06:44:51 AM
rwxr-xr-x
📄
araxis
358 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
bc
367 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
bc3
24 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
codecompare
353 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
deltawalker
663 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
diffmerge
309 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
diffuse
248 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
ecmerge
306 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
emerge
438 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
examdiff
336 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
gvimdiff
29 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
gvimdiff2
29 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
gvimdiff3
29 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
kdiff3
522 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
kompare
117 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
meld
843 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
opendiff
267 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
p4merge
617 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
tkdiff
258 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
tortoisemerge
602 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
vimdiff
890 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
vimdiff2
29 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
vimdiff3
29 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
winmerge
361 bytes
10/14/2022 02:15:33 PM
rw-r--r--
📄
xxdiff
584 bytes
10/14/2022 02:15:33 PM
rw-r--r--
Editing: deltawalker
Close
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 } merge_cmd () { # Adding $(pwd)/ in front of $MERGED should not be necessary. # However without it, DeltaWalker (at least v1.9.8 on Windows) # crashes with a JRE exception. The DeltaWalker user manual, # shows $(pwd)/ whenever the '-merged' options is given. # Adding it here seems to work around the problem. if $base_present then "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$(pwd)/$MERGED" else "$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$(pwd)/$MERGED" fi >/dev/null 2>&1 } translate_merge_tool_path () { echo DeltaWalker } exit_code_trustable () { true }