contrib / colordiff / READMEon commit Keep untracked files not involved in a merge. (183d797)
   1This is "colordiff" (http://colordiff.sourceforge.net/) by Dave
   2Ewart <davee@sungate.co.uk>, modified specifically for git.