Andrew's git / gitweb.git / diff
?
Merge branch 'rs/use-strbuf-complete-line'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:28:22 +0000 (12:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:28:22 +0000 (12:28 -0800)
* rs/use-strbuf-complete-line:
use strbuf_complete_line() for adding a newline if needed

1  2 
builtin/fmt-merge-msg.c patch | diff1 | diff2 | blob | history
trace.c patch | diff1 | diff2 | blob | history
diff --cc builtin/fmt-merge-msg.c
Simple merge
diff --cc trace.c
Simple merge