contrib / colordiff / READMEon commit diff-index --cached --raw: show tree entry on the LHS for unmerged entries. (e9c8409)
   1This is "colordiff" (http://colordiff.sourceforge.net/) by Dave
   2Ewart <davee@sungate.co.uk>, modified specifically for git.