On Wed, Nov 2, 2016 at 6:04 AM, Jeff King <p...@peff.net> wrote: > > attr.c | 58 > ++++++++++++++++++++++++++++++++-------------------
$ git diff --stat origin/master..origin/sb/attr |grep attr.c attr.c | 531 +- >From a cursory read of your series this may result in a merge conflict, but would be easily fixable (changed signature of functions that clash).
