I like the interleaved comments with the header and body format. I wonder if the authors knew that unidiffs already support comment lines? From the PATCH(1) man page:
"After removing indenting or encapsulation, lines beginning with # are ignored, as they are considered to be comments."
"After removing indenting or encapsulation, lines beginning with # are ignored, as they are considered to be comments."