Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: b3cf6f3b8d21b32d88313fc709442b78300975db authored by Junio C Hamano on 22 December 2012, 19:48:47 UTC
Git 1.8.1-rc3
Tip revision: b3cf6f3
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
}
back to top