contrib / colordiff / READMEon commit Merge branch 'jc/unresolve' (cdb6350)
   1This is "colordiff" (http://colordiff.sourceforge.net/) by Dave
   2Ewart <davee@sungate.co.uk>, modified specifically for git.