Merge branch 'cb/log-follow-with-combined' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:30:59 +0000 (3 15:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:30:59 +0000 (3 15:30 -0700)
"git log -c --follow $path" segfaulted upon hitting the commit that
renamed the $path being followed.

* cb/log-follow-with-combined:
  fix segfault with git log -c --follow

1  2 
combine-diff.c
t/t4202-log.sh

diff --cc combine-diff.c
Simple merge
diff --cc t/t4202-log.sh
Simple merge