Merge branch 'jk/strbuf-vaddf' into next
commit9651bc59230eddff675c25daab6424ee06dc1853
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2011 00:38:58 +0000 (9 16:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2011 00:38:58 +0000 (9 16:38 -0800)
tree30e912f9ced8d930fd69eb515f6726d1956d02dc
parent004fb9c07f8edb7b9a70cc713a435f074863c780
parent26db0f2e3afc043e184a5e0ce5eb7c53aeb1f644
Merge branch 'jk/strbuf-vaddf' into next

* jk/strbuf-vaddf:
  compat: fall back on __va_copy if available
  strbuf: add strbuf_vaddf
  compat: provide a fallback va_copy definition
merge-recursive.c