Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Mon, 6 Mar 2006 08:41:47 +0000 (00:41 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 6 Mar 2006 08:41:47 +0000 (00:41 -0800)
* master:
  annotate-blame: tests incomplete lines.
  blame: unbreak "diff -U 0".


Trivial merge