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. :-) Also read the patches and they LGTM. > Â[4/5]: refactor get_textconv to not require diff_filespec > Â[5/5]: combine-diff: respect textconv attributes Didn't test explicitly, but don't see anything obviously wrong. Thanks Peff, j. -- 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