contrib / colordiff / READMEon commit merge-recursive: adjust to loosened "working file clobbered" check (65ac6e9)
   1This is "colordiff" (http://colordiff.sourceforge.net/) by Dave
   2Ewart <davee@sungate.co.uk>, modified specifically for git.