From: Junio C Hamano <junkio@cox.net>
Date: Fri, 7 Apr 2006 09:12:48 +0000 (-0700)
Subject: Merge branch 'jc/blame' into next
X-Git-Tag: v1.3.0-rc4~33
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=dd4bca39eccd01d93fe7916df3b8cb6f68629211;p=git.git

Merge branch 'jc/blame' into next

* jc/blame:
  blame -S <ancestry-file>
  Match ofs/cnt types in diff interface.
---

dd4bca39eccd01d93fe7916df3b8cb6f68629211