![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 Oct 2010 22:06:21 +0000 (15:06 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 Oct 2010 22:06:21 +0000 (15:06 -0700) | ||
| commit | cbe69e29b98c9d733cf934717c42cd085d37af9f | |
| tree | 0eb7302a306666d397ee65e223cecc66bb4b21e7 | tree | snapshot |
| parent | ab1c9886b00c28bca79e57f7fc7843486f0248f3 | commit | diff |
| parent | d7806967bd984c75d8abd7afea3fd4930ad0c3fb | commit | diff |
Merge branch 'master' into next
* master:
Fix copy-pasted comments related to tree diff handling.
* master:
Fix copy-pasted comments related to tree diff handling.
| diff.c | diff1 | | diff2 | | blob | history |