Server : Apache/2.4.41 (Ubuntu) System : Linux journalup 5.4.0-198-generic #218-Ubuntu SMP Fri Sep 27 20:18:53 UTC 2024 x86_64 User : www-data ( 33) PHP Version : 7.4.33 Disable Function : pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, Directory :  /lib/git-core/mergetools/

Upload File : current_dir [ Writeable ] document_root [ Writeable ]

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
}