Merge branch 'rs/fmt-merge-msg-string-leak-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Dec 2017 19:16:23 +0000 (11:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Dec 2017 19:16:23 +0000 (11:16 -0800)
Leakfix.

* rs/fmt-merge-msg-string-leak-fix:
  fmt-merge-msg: avoid leaking strbuf in shortlog()

1  2 
builtin/fmt-merge-msg.c

Simple merge