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 jo...@joeyh.name is not reachable from web.de) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html