Code

Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Oct 2010 22:06:21 +0000 (15:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Oct 2010 22:06:21 +0000 (15:06 -0700)
* master:
  Fix copy-pasted comments related to tree diff handling.

1  2 
diff.c

diff --cc diff.c
Simple merge