contrib / colordiff / READMEon commit Use merge-recursive in git-checkout -m (branch switching) (c1a4278)
   1This is "colordiff" (http://colordiff.sourceforge.net/) by Dave
   2Ewart <davee@sungate.co.uk>, modified specifically for git.