How to fix common mistakes in Git

boing
19

Mercurial has pluggable diff and merge tools which are intended to assist with cases like this.