From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 08 Mar 2016 18:51:47 GMT
Subject: Re: [PATCH] Also read SQUASH_MSG if a conflict on a merge squash occurred
Message-ID: <xmqq1t7kls58.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <56DF1EBD.8050503@cs-ware.de>

Sven Strickroth <sven@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.