On Mon, May 23, 2011 at 06:55:07PM -0400, Jay Soffian wrote: > On Mon, May 23, 2011 at 4:15 PM, Jeff King <peff@xxxxxxxx> wrote: > > It turned out not too bad: > > > > Â[1/5]: combine-diff: split header printing into its own function > > Â[2/5]: combine-diff: calculate mode_differs earlier > > Â[3/5]: combine-diff: handle binary files as binary > > Tested-by: Jay Soffian <jaysoffian@xxxxxxxxx> > > In a real-world merge, png's were correctly shown as "Binary files > differ". I also tested with "*.xib -diff" and that worked as expected. > > However, custom diff drivers (still) don't work. :-) Yeah, I didn't add any support for that. I'm not sure what it should do; custom diff drivers don't know how to handle combined diff, do they? If you write me a test case that explains what _should_ happen, I'll see what I can do. :) -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html