Sync with 1.7.8.5
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 00:42:35 +0000 (16:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 00:42:35 +0000 (16:42 -0800)
1  2 
Makefile
grep.c
t/t4150-am.sh

diff --cc Makefile
Simple merge
diff --cc grep.c
Simple merge
diff --cc t/t4150-am.sh
Simple merge