Merge branch 'ss/blame-textconv-fake-working-tree'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Nov 2011 00:43:19 +0000 (16:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Nov 2011 00:43:19 +0000 (16:43 -0800)
* ss/blame-textconv-fake-working-tree:
blame.c: Properly initialize strbuf after calling textconv_object(), again

1  2 
builtin/blame.c
diff --cc builtin/blame.c
Simple merge