Jameson Graef Rollins <jrollins@finestructure.net> writes: > +diff OUTPUT.{text,html} >OUTPUT.diff > +cat <<EOF >EXPECTED.diff > +7,9c7,10 > +< [ text/html (not shown) ] > +< [ text/plain ] > +< This is the text/plain part of a multipart/alternative. > +--- > +> [ text/html ] > +> This is the text/html part of a multipart/alternative. > +> > +> [ text/plain (not shown) ] > +EOF Hmm, old-school diff. I guess this (instead of unified diff) is so that if the diff isn't like this, then the diff of the diffs are clearly readable? :) git am complains at me because this patch introduces trailing whitespace (to mimic, of course, the output of diff which will have trailing whitespace as well). I would love for you to write this file using some other technique which would not require putting trailing whitespace in the test file. Additionally the patch is stale, perhaps because my patch that moved some tests to emacs-show was just pushed too. Ethan