contrib / colordiff / READMEon commit Remove uncontested renamed files during merge. (8371234)
   1This is "colordiff" (http://colordiff.sourceforge.net/) by Dave
   2Ewart <davee@sungate.co.uk>, modified specifically for git.