"brian m. carlson" <sandals@xxxxxxxxxxxxxxxxxxxx> writes: > On Wed, Sep 07, 2016 at 01:12:09PM -0700, Junio C Hamano wrote: >> It is a bit unfortunate that this conflicts somewhat in builtin/cat-file.c >> and heavily with builtin/apply.c with other topics in flight. >> >> Let me see how bad the conflict resolution is and report back later. > > If it ends up being problematic, feel free to drop the appropriate > patches and I'll fix them up and send them in in the next set. Let's see how well I do first ;-) There was another one in wt-status.c that was touched by the "status --porcelain=v2" series, but I haven't finished today's merges yet.