Merge branch 'tr/maint-bundle-long-subject' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 06:16:30 +0000 (22:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 06:16:30 +0000 (22:16 -0800)
* tr/maint-bundle-long-subject:
  t5704: match tests to modern style
  strbuf: improve strbuf_get*line documentation
  bundle: use a strbuf to scan the log for boundary commits
  bundle: put strbuf_readline_fd in strbuf.c with adjustments

1  2 
bundle.c
strbuf.c
strbuf.h

diff --cc bundle.c
Simple merge
diff --cc strbuf.c
Simple merge
diff --cc strbuf.h
Simple merge