Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: 3ddac3d691c3633cd4d9a74c07e3b2301f546f77 authored by Junio C Hamano on 17 July 2020, 01:02:52 UTC
Git 2.28-rc1
Tip revision: 3ddac3d
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