contrib / colordiff / READMEon commit read-tree -u one-way merge fix to check out locally modified paths. (613f027)
   1This is "colordiff" (http://colordiff.sourceforge.net/) by Dave
   2Ewart <davee@sungate.co.uk>, modified specifically for git.