Merge branch 'bd/diff-strbuf' into next
commit6045a297fdd51bf73e7e93ff4a10a9903d0ac70c
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Aug 2008 00:09:10 +0000 (17 17:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Aug 2008 00:09:10 +0000 (17 17:09 -0700)
tree97405ba4e0e7d137d16e8eb3cc6eb7f06988fe51
parentf34403fe1e47a637a50df0abcac8bc9179134dd5
parent8a3f524bf2ac534b313a7d8e70cc164cef744949
Merge branch 'bd/diff-strbuf' into next

* bd/diff-strbuf:
  xdiff-interface: hide the whole "xdiff_emit_state" business from the caller
  Use strbuf for struct xdiff_emit_state's remainder
  Make xdi_diff_outf interface for running xdiff_outf diffs