From: Junio C Hamano <junkio@cox.net>
Date: Thu, 7 Sep 2006 08:33:45 +0000 (-0700)
Subject: Merge branch 'pm/diff'
X-Git-Tag: v1.4.3-rc1~128
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8895cbcda15bec1cfe62bc7fb91cef044fceac20;p=git.git

Merge branch 'pm/diff'

* pm/diff:
  diff-index --cc shows a 3-way diff between HEAD, index and working tree.
---

8895cbcda15bec1cfe62bc7fb91cef044fceac20