![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Nov 2011 22:20:28 +0000 (15:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Nov 2011 22:20:28 +0000 (15:20 -0700) | ||
| commit | b919f8404a9e212b3b9d602d4060e440072a0303 | |
| tree | c8a2b04cb95fef931d7b75a5e6bdc0db32ac4d79 | tree | snapshot |
| parent | 7406aa203ff0571815fc472486ae7271049185e6 | commit | diff |
| parent | 55e7c0aaa1b2c00d147b1b4b1aa88a71d90dacf4 | commit | diff |
Merge branch 'ss/blame-textconv-fake-working-tree'
* ss/blame-textconv-fake-working-tree:
(squash) test for previous
blame.c: Properly initialize strbuf after calling, textconv_object()
Conflicts:
t/t8006-blame-textconv.sh
* ss/blame-textconv-fake-working-tree:
(squash) test for previous
blame.c: Properly initialize strbuf after calling, textconv_object()
Conflicts:
t/t8006-blame-textconv.sh
| builtin/blame.c | diff1 | | diff2 | | blob | history |
| t/t8006-blame-textconv.sh | diff1 | | diff2 | | blob | history |