Subject: Re: What's cooking in git.git (Jun 2016, #05; Thu, 16)

From: Junio C Hamano <[email-masked]>
Date: Mon, 20 Jun 2016 13:06:22 -0700

Torsten Bögershausen <[email-masked]> 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?