[PATCH] Don't output 'Automatic merge failed, ...'
[git.git] / diff-index.c
2005-09-08 Junio C HamanoBig tool rename.