From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Aug 2008 04:43:40 +0000 (-0700)
Subject: Merge branch 'bd/diff-strbuf'
X-Git-Tag: v1.6.1-rc1~339
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3814c07498f87e7d27b55175ca2852fcc4cd27f4;p=git.git

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
---

3814c07498f87e7d27b55175ca2852fcc4cd27f4