Subject: Re: [PATCH] Also read SQUASH_MSG if a conflict on a merge squash occurred

From: Junio C Hamano <[email-masked]>
Date: Tue, 08 Mar 2016 10:51:47 -0800

Sven Strickroth <[email-masked]> 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.