From: Junio C Hamano <junkio@cox.net>
Date: Sat, 8 Apr 2006 00:57:46 +0000 (-0700)
Subject: Merge branch 'jc/blame'
X-Git-Tag: v1.3.0-rc3~6
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=45fa7608bd1abd4dca12b0b90a852e7a71377381;p=git.git

Merge branch 'jc/blame'

* jc/blame:
  blame -S <ancestry-file>
  Match ofs/cnt types in diff interface.
  blame: use built-in xdiff
  combine-diff: move the code to parse hunk-header into common library.
  combine-diff: refactor built-in xdiff interface.
  combine-diff: use built-in xdiff.
---

45fa7608bd1abd4dca12b0b90a852e7a71377381