> > strbuf_addbuf(&buf, &line); > > + } > > My preliminary reading (I sadly lack the time to pull your branch and play > with it) suggests that this works, although I have to admit that X/Y/Z > would confuse me in 6 months from now, as they do not really read like > diff markers but like plain text. I could imagine that '>', '<' and '#' > would not impart that confusion on me. Thanks for that suggestion! (I'll change it and add a comment)