From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Jun 2016 20:06:22 GMT
Subject: Re: What's cooking in git.git (Jun 2016, #05; Thu, 16)
Message-ID: <xmqq60t3tykh.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <18617acb-bcdb-607d-007e-552dabd352cb@web.de>

Torsten Bögershausen <tboegi@web.de> writes:

> There is a conflict in pu:
> "jh/clean-smudge-annex" does not work together with "tb/convert-peek-in-index"
>
> (And currently pu didn't compile)

Thanks for a report, but didn't I mention this breakage in the
What's cooking report already?