Merge branch 'bd/diff-strbuf'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Aug 2008 04:43:40 +0000 (21:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Aug 2008 04:43:40 +0000 (21:43 -0700)
commit3814c07498f87e7d27b55175ca2852fcc4cd27f4
tree92e59a8d7d9ca5dd3d2928107b88d4b424817c3f
parentd8eec50468a64b23e1013bac9e78fc447af046ca
parent8a3f524bf2ac534b313a7d8e70cc164cef744949
Merge branch 'bd/diff-strbuf'

* 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
diff.c