https://github.com/git/git
Raw File
Tip revision: e46579643d56162299b1756b70d418005351b256 authored by Junio C Hamano on 17 March 2016, 17:56:06 UTC
Git 2.6.6
Tip revision: e465796
diffmerge
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" --merge --result="$MERGED" \
			"$LOCAL" "$BASE" "$REMOTE"
	else
		"$merge_tool_path" --merge \
			--result="$MERGED" "$LOCAL" "$REMOTE"
	fi
}
back to top