On Sun, Sep 28, 2008 at 04:06:56AM +0200, Matthieu Moy wrote: > +static int textconv_two_files(const char *textconv, > + const char *name_a, > + const char *name_b, > + mmfile_t *mf1, > + mmfile_t *mf2, > + struct diff_filespec *one, > + struct diff_filespec *two) > +{ Must we always be textconv'ing two files? What if I am comparing "v1.5:foo.odf" to "foo.txt" in the working tree? In my implementation, I textconv one at a time. I just did so from fill_mmfile, so all of diff automagically just sees the converted text. -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