Merge branch 'sb/line-log-plug-pairdiff-leak' into maint
commita379f25462639eb95b05133c84374558a23bc7b0
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 May 2015 21:05:56 +0000 (13 14:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 May 2015 21:05:56 +0000 (13 14:05 -0700)
treebb5087a3668b2c18af771f69399731fd3fae6053
parent071e93a14844f474d313eec1a035816192616889
parent05bfc7dcaa0e99e045c326e2887dba24e58266d8
Merge branch 'sb/line-log-plug-pairdiff-leak' into maint

* sb/line-log-plug-pairdiff-leak:
  line-log.c: fix a memleak
line-log.c