Remove dangerous 'git-showmerge'

Ok, so it's not *dangerous* per se, but by randomly checking out stuff
it will probably confuse you.
evil-base-diffdiff: draft of another possible approach

This one looks at the interdiff of Y..A vs. M..B (and Y..B vs. M..A
symmetrically).