@Ghazascanner
_2019runbot
Ghazascanner File Manager
server :Linux phpmyadmin-ubuntu-m-2vcpu-16gb-blr1-01 5.4.0-216-generic #236-Ubuntu SMP Fri Apr 11 19:53:21 UTC 2025 x86_64
Current Path :
/
lib
/
git-core
/
mergetools
/
Path :
Upload File :
New :
File
Dir
//lib/git-core/mergetools/meld
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 }