![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 6 Mar 2006 08:41:47 +0000 (00:41 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 6 Mar 2006 08:41:47 +0000 (00:41 -0800) | ||
| commit | 806b8198cdbd3c838d7cbd94f4f256aa71389891 | |
| tree | d8ea150860a21c90f700871f44ae812d8371fc71 | tree | snapshot |
| parent | 3bcd59a546333ae355c87577ba63f8dccd50a519 | commit | diff |
| parent | 1242642c468a7bcc335a676273eae4ced8a55f04 | commit | diff |
Merge branch 'master' into next
* master:
annotate-blame: tests incomplete lines.
blame: unbreak "diff -U 0".
* master:
annotate-blame: tests incomplete lines.
blame: unbreak "diff -U 0".