HEX
Server: Apache
System: Linux vpshost0650.publiccloud.com.br 4.4.79-grsec-1.lc.x86_64 #1 SMP Wed Aug 2 14:18:21 -03 2017 x86_64
User: bandeirantesbomb3 (10068)
PHP: 8.0.7
Disabled: apache_child_terminate,dl,escapeshellarg,escapeshellcmd,exec,link,mail,openlog,passthru,pcntl_alarm,pcntl_exec,pcntl_fork,pcntl_get_last_error,pcntl_getpriority,pcntl_setpriority,pcntl_signal,pcntl_signal_dispatch,pcntl_sigprocmask,pcntl_sigtimedwait,pcntl_sigwaitinfo,pcntl_strerror,pcntl_wait,pcntl_waitpid,pcntl_wexitstatus,pcntl_wifexited,pcntl_wifsignaled,pcntl_wifstopped,pcntl_wstopsig,pcntl_wtermsig,php_check_syntax,php_strip_whitespace,popen,proc_close,proc_open,shell_exec,symlink,system
Upload Files
File: //usr/libexec/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
	touch "$BACKUP"
	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_unchanged
}

# Check whether 'meld --output <file>' is supported
check_meld_for_output_version () {
	meld_path="$(git config mergetool.meld.path)"
	meld_path="${meld_path:-meld}"

	if "$meld_path" --help 2>&1 | grep -e --output >/dev/null
	then
		meld_has_output_option=true
	else
		meld_has_output_option=false
	fi
}