Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: 7e27bd589d328b9daf154c2444d1a86ec3afedb0 authored by Junio C Hamano on 29 October 2021, 22:43:50 UTC
Git 2.34-rc0
Tip revision: 7e27bd5
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