Merge branch 'rs/use-strbuf-complete-line'
commita305b15f82984bd000351e5ab4720a4a170e42b0
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:28:22 +0000 (22 12:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:28:22 +0000 (22 12:28 -0800)
tree57610b81424bc4aecbfd7a6da78c1d1ca7a0167f
parent35b5a8b76999e3c48c3e01c3fd8559bd447d2dfa
parenta0d4923ddfb65c91d2b84ca74eee09424f986a8b
Merge branch 'rs/use-strbuf-complete-line'

* rs/use-strbuf-complete-line:
  use strbuf_complete_line() for adding a newline if needed
builtin/fmt-merge-msg.c
trace.c