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

1  2 
line-log.c

diff --cc line-log.c
Simple merge