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: meld
Close
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } merge_cmd () { if test -z "${meld_has_output_option:+set}" then check_meld_for_output_version fi if test "$meld_has_output_option" = true then "$merge_tool_path" --output="$MERGED" \ "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" fi } # Check whether we should use 'meld --output <file>' check_meld_for_output_version () { meld_path="$(git config mergetool.meld.path)" meld_path="${meld_path:-meld}" if meld_has_output_option=$(git config --bool mergetool.meld.hasOutput) then : use configured value elif "$meld_path" --help 2>&1 | grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null then : old ones mention --output and new ones just say OPTION... meld_has_output_option=true else meld_has_output_option=false fi }