[PATCH] Don't output 'Automatic merge failed, ...'
[gitweb.git] / git-diff.sh
2005-09-08 Big tool rename.