Sven Strickroth <s...@cs-ware.de> writes:

> Here hook_arg1 would be always "merge" and never "squash"... Before my
> change it was only "squash" if no conflict occurred.

Oh, that wasn't an intended change.  It was merely an illustration
of a possible restructuring of the flow to avoid having to have
identical read functions in two separate places.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to