contrib / colordiff / READMEon commit git-merge: fix confusion between tag and branch (3683dc5)
   1This is "colordiff" (http://colordiff.sourceforge.net/) by Dave
   2Ewart <davee@sungate.co.uk>, modified specifically for git.