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: tortoisemerge
Close
can_diff () { return 1 } merge_cmd () { if $base_present then basename="$(basename "$merge_tool_path" .exe)" if test "$basename" = "tortoisegitmerge" then "$merge_tool_path" \ -base "$BASE" -mine "$LOCAL" \ -theirs "$REMOTE" -merged "$MERGED" else "$merge_tool_path" \ -base:"$BASE" -mine:"$LOCAL" \ -theirs:"$REMOTE" -merged:"$MERGED" fi else echo "$merge_tool_path cannot be used without a base" 1>&2 return 1 fi } translate_merge_tool_path() { if type tortoisegitmerge >/dev/null 2>/dev/null then echo tortoisegitmerge else echo tortoisemerge fi }