Andrew's git / gitweb.git / contrib/colordiff/README
?
contrib / colordiff / READMEon commit git-revert with conflicts to behave as git-merge with conflicts (a9cb3c6)
   1This is "colordiff" (http://colordiff.sourceforge.net/) by Dave
   2Ewart <davee@sungate.co.uk>, modified specifically for git.