I've been feeling a bit ugfwiinic all the afternoon and I couldn't realize why,
but then I finally saw your post and I understood!
But Dscho, now I am sure that you missed that "git diff -odf" at the very core
of git functionality that certainly Linus implemented on day one and that surely
got lost due to an unfortunate SHA clash!
Ciao
Sergio