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

From: Torsten Bögershausen <[email-masked]>
Date: Mon, 20 Jun 2016 08:06:29 +0200

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)

(I will hopefully be able to do a separate review of the smudge/clean patch)

(And [email-masked] is not reachable from web.de)