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)
* jc/blame:
  blame -S <ancestry-file>
  Match ofs/cnt types in diff interface.

1  2 
blame.c

diff --cc blame.c
Simple merge