From: Junio C Hamano <junkio@cox.net>
Date: Wed, 5 Apr 2006 21:26:00 +0000 (-0700)
Subject: Merge branch 'jc/blame' into next
X-Git-Tag: v1.3.0-rc4~37
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1b83ace35e7869ad77810ab68984b1bf2b8c7038;p=git.git

Merge branch 'jc/blame' into next

* jc/blame:
  blame: use built-in xdiff
---

1b83ace35e7869ad77810ab68984b1bf2b8c7038