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. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: https://keybase.io/bk2204
Description: PGP signature