Andrew's git / gitweb.git / diff
?
Merge branch 'pm/diff'
authorJunio C Hamano <junkio@cox.net>
Thu, 7 Sep 2006 08:33:45 +0000 (01:33 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 7 Sep 2006 08:33:45 +0000 (01:33 -0700)
* pm/diff:
diff-index --cc shows a 3-way diff between HEAD, index and working tree.

Trivial merge