OXIESEC PANEL
- Current Dir:
/
/
usr
/
libexec
/
git-core
/
mergetools
Server IP: 2a02:4780:11:1084:0:327f:3464:10
Upload:
Create Dir:
Name
Size
Modified
Perms
📁
..
-
02/08/2025 12:06:28 AM
rwxr-xr-x
📄
araxis
515 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
bc
584 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
codecompare
510 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
deltawalker
818 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
diffmerge
460 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
diffuse
395 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
ecmerge
453 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
emerge
535 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
examdiff
493 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
guiffy
432 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
gvimdiff
29 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
kdiff3
818 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
kompare
264 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
meld
2.16 KB
05/31/2024 12:41:06 AM
rw-r--r--
📄
nvimdiff
29 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
opendiff
418 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
smerge
423 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
tkdiff
403 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
tortoisemerge
761 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
vimdiff
17.09 KB
05/31/2024 12:41:06 AM
rw-r--r--
📄
winmerge
510 bytes
05/31/2024 12:41:06 AM
rw-r--r--
📄
xxdiff
913 bytes
05/31/2024 12:41:06 AM
rw-r--r--
Editing: diffuse
Close
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" | cat } diff_cmd_help () { echo "Use Diffuse (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" \ "$LOCAL" "$MERGED" "$REMOTE" \ "$BASE" | cat else "$merge_tool_path" \ "$LOCAL" "$MERGED" "$REMOTE" | cat fi } merge_cmd_help () { echo "Use Diffuse (requires a graphical session)" }