Merge branch 'pm/diff'
commit8895cbcda15bec1cfe62bc7fb91cef044fceac20
authorJunio C Hamano <junkio@cox.net>
Thu, 7 Sep 2006 08:33:45 +0000 (7 01:33 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 7 Sep 2006 08:33:45 +0000 (7 01:33 -0700)
tree28945b8e8cd71831525763cfb16af21694f1390a
parent0ea2582d1cbbacd91eb0f040c4994ecd2bb6cdb9
parentcb2b9f5ee15547e878c668504140c66f3a42d81c
Merge branch 'pm/diff'

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