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: winmerge
Close
diff_cmd () { "$merge_tool_path" -u -e "$LOCAL" "$REMOTE" return 0 } merge_cmd () { # mergetool.winmerge.trustExitCode is implicitly false. # touch $BACKUP so that we can check_unchanged. "$merge_tool_path" -u -e -dl Local -dr Remote \ "$LOCAL" "$REMOTE" "$MERGED" } translate_merge_tool_path() { mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge" }