Merge branch 'jc/blame' into next
authorJunio C Hamano <junkio@cox.net>
Fri, 7 Apr 2006 09:12:48 +0000 (02:12 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 7 Apr 2006 09:12:48 +0000 (02:12 -0700)
commitdd4bca39eccd01d93fe7916df3b8cb6f68629211
treeef13090eccd568874f4ee5c67ae3e0390766bb8a
parent38b525e09f9088338e03ad0169e3cc7b5ab2e7af
parent5040f17eba15504bad66b14a645bddd9b015ebb7
Merge branch 'jc/blame' into next

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