Merge branch 'cb/log-follow-with-combined'
commita1ddd1145282b363dcfc08c6ab8fb0c688f88f16
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:30:36 +0000 (11 13:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:30:36 +0000 (11 13:30 -0700)
treed53f7f6cb6851d2497ada1aafb7e189ad7de7334
parentcb4d6c2b7d5b710b9108a39b2df5fcff77c65463
parent46ec510ac088ac2669e617a4c8c35e6218dabecc
Merge branch 'cb/log-follow-with-combined'

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