SF bug 124051: ndiff "?" lines can be confusing. Well, they still can, but

after implementing it I liked Gregor's two-"?" line idea a lot.