Merge branch 'rs/use-strbuf-complete-line'

* rs/use-strbuf-complete-line:
  use strbuf_complete_line() for adding a newline if needed

diff --cc builtin/fmt-merge-msg.c
Simple merge

diff --cc trace.c
Simple merge