Merge branch 'maint'
commitd7806967bd984c75d8abd7afea3fd4930ad0c3fb
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Oct 2010 22:04:05 +0000 (26 15:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Oct 2010 22:04:05 +0000 (26 15:04 -0700)
treedc3d5a20c8e7c59186be8a007bf2349bcae9e567
parentd4c436975214d8f94d38f9be0ef709b4714fc821
parentc3fced64981e3d2700d83c0a6661ac347df5121e
Merge branch 'maint'

* maint:
  Fix copy-pasted comments related to tree diff handling.
diff.c