![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 5 Mar 2006 00:21:33 +0000 (16:21 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 5 Mar 2006 00:21:33 +0000 (16:21 -0800) | ||
| commit | 3ab8532b07f37e9f16df8aaaadd175646b7bea26 | |
| tree | a8dcdaca637a8a170662290ce60647636df7c746 | tree | snapshot |
| parent | b463ceb885290a6656239ff3f1e73c5774dc8ee9 | commit | diff |
| parent | 1c7fee5d0857d809fe5d93a1d56968e44296ce55 | commit | diff |
Merge branch 'master' into next
* master:
Cauterize dropped or duplicate bits from next.
Merge part of 'sp/checkout'
* master:
Cauterize dropped or duplicate bits from next.
Merge part of 'sp/checkout'