From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Jun 2016 22:45:22 GMT
Subject: Re: [PATCH v4 8/8] use smudgeToFile filter in recursive merge
Message-ID: <xmqqy45wkflp.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <xmqq7fdglx83.fsf@gitster.mtv.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

>> +			int smudge_to_file = can_smudge_to_file(path);
>
> This does not compile with decl-after-statement.  I suspect other
> patches in this series have the same issue but I did not check.  Do
> you say "make DEVELOPER=1"?

As a tentative workaround, I've queued a squashable compilation fix
at the tip of the topic after queuing.  Please find it in 'pu' when
it gets pushed out sometime later today.

Thanks.