contrib / colordiff / READMEon commit apply: check D/F conflicts more carefully. (c28c571)
   1This is "colordiff" (http://colordiff.sourceforge.net/) by Dave
   2Ewart <davee@sungate.co.uk>, modified specifically for git.