Gecko [ v3.cesa.co.za ]

Name	Size	Permission	Date
araxis	515 B	-rw-r--r--	2025-10-07 12:22
bc	584 B	-rw-r--r--	2025-10-07 12:22
codecompare	510 B	-rw-r--r--	2025-10-07 12:22
deltawalker	818 B	-rw-r--r--	2025-10-07 12:22
diffmerge	460 B	-rw-r--r--	2025-10-07 12:22
diffuse	395 B	-rw-r--r--	2025-10-07 12:22
ecmerge	453 B	-rw-r--r--	2025-10-07 12:22
emerge	535 B	-rw-r--r--	2025-10-07 12:22
examdiff	493 B	-rw-r--r--	2025-10-07 12:22
guiffy	432 B	-rw-r--r--	2025-10-07 12:22
gvimdiff	29 B	-rw-r--r--	2025-10-07 12:22
kdiff3	818 B	-rw-r--r--	2025-10-07 12:22
kompare	264 B	-rw-r--r--	2025-10-07 12:22
meld	2.16 KB	-rw-r--r--	2025-10-07 12:22
nvimdiff	29 B	-rw-r--r--	2025-10-07 12:22
opendiff	418 B	-rw-r--r--	2025-10-07 12:22
p4merge	784 B	-rw-r--r--	2025-10-07 12:22
smerge	423 B	-rw-r--r--	2025-10-07 12:22
tkdiff	403 B	-rw-r--r--	2025-10-07 12:22
tortoisemerge	761 B	-rw-r--r--	2025-10-07 12:22
vimdiff	17.09 KB	-rw-r--r--	2025-10-07 12:22
winmerge	510 B	-rw-r--r--	2025-10-07 12:22
xxdiff	913 B	-rw-r--r--	2025-10-07 12:22

Rename

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

diff_cmd_help () {
	echo "Use Meld (requires a graphical session)"
}

merge_cmd () {
	check_meld_for_features

option_auto_merge=
	if test "$meld_use_auto_merge_option" = true
	then
		option_auto_merge="--auto-merge"
	fi

if test "$meld_has_output_option" = true
	then
		"$merge_tool_path" $option_auto_merge --output="$MERGED" \
			"$LOCAL" "$BASE" "$REMOTE"
	else
		"$merge_tool_path" $option_auto_merge "$LOCAL" "$MERGED" "$REMOTE"
	fi
}

merge_cmd_help () {
	echo "Use Meld (requires a graphical session) with optional \`auto merge\` (see \`git help mergetool\`'s \`CONFIGURATION\` section)"
}

# Get meld help message
init_meld_help_msg () {
	if test -z "$meld_help_msg"
	then
		meld_path="$(git config mergetool.meld.path || echo meld)"
		meld_help_msg=$("$meld_path" --help 2>&1)
	fi
}

# Check the features and set flags
check_meld_for_features () {
	# Check whether we should use 'meld --output <file>'
	if test -z "$meld_has_output_option"
	then
		meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
		case "$meld_has_output_option" in
		true | false)
			: use configured value
			;;
		*)
			: empty or invalid configured value, detecting "--output" automatically
			init_meld_help_msg

case "$meld_help_msg" in
			*"--output="* | *'[OPTION...]'*)
				# All version that has [OPTION...] supports --output
				meld_has_output_option=true
				;;
			*)
				meld_has_output_option=false
				;;
			esac
			;;
		esac
	fi
	# Check whether we should use 'meld --auto-merge ...'
	if test -z "$meld_use_auto_merge_option"
	then
		meld_use_auto_merge_option=$(
			git config --bool-or-str mergetool.meld.useAutoMerge
		)
		case "$meld_use_auto_merge_option" in
		true | false)
			: use well formatted boolean value
			;;
		auto)
			# testing the "--auto-merge" option only if config is "auto"
			init_meld_help_msg

case "$meld_help_msg" in
			*"--auto-merge"* | *'[OPTION...]'*)
				meld_use_auto_merge_option=true
				;;
			*)
				meld_use_auto_merge_option=false
				;;
			esac
			;;
		"")
			meld_use_auto_merge_option=false
			;;
		*)
			die "unknown mergetool.meld.useAutoMerge: $meld_use_auto_merge_option"
			;;
		esac
	fi
}