Merge branch 'cb/log-follow-with-combined' into next
commitd5bf4f38016310b21904a5b0e3cc4528aa69c36b
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Jun 2013 22:27:02 +0000 (4 15:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Jun 2013 22:27:02 +0000 (4 15:27 -0700)
tree687ae13406929ad159726be3c15ecb5b8948dec3
parenta4ee0e05f6bbe060bebd04054fe8360ae4e85249
parent46ec510ac088ac2669e617a4c8c35e6218dabecc
Merge branch 'cb/log-follow-with-combined' into next

* cb/log-follow-with-combined:
  fix segfault with git log -c --follow
combine-diff.c
t/t4202-log.sh