Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: 773e3a2e0226cffac6c813c2d3bea5ba480675d8 authored by Junio C Hamano on 05 May 2017, 04:29:43 UTC
Git 2.11.2
Tip revision: 773e3a2
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
}

exit_code_trustable () {
	true
}
back to top