Merge branch 'jc/blame' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 5 Apr 2006 21:26:00 +0000 (14:26 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 5 Apr 2006 21:26:00 +0000 (14:26 -0700)
* jc/blame:
  blame: use built-in xdiff


Trivial merge