From: Junio C Hamano Date: Mon, 6 Mar 2006 08:41:47 +0000 (-0800) Subject: Merge branch 'master' into next X-Git-Tag: v1.3.0-rc1~44 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=806b8198cdbd3c838d7cbd94f4f256aa71389891;p=git.git Merge branch 'master' into next * master: annotate-blame: tests incomplete lines. blame: unbreak "diff -U 0". --- 806b8198cdbd3c838d7cbd94f4f256aa71389891