Merge branch 'jk/maint-tformat-with-z' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 May 2012 18:42:34 +0000 (11:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 May 2012 18:42:34 +0000 (11:42 -0700)
By Jan Krüger (1) and Junio C Hamano (1)
* jk/maint-tformat-with-z:
log-tree: the previous one is still not quite right
log-tree: use custom line terminator in line termination mode

1  2 
log-tree.c
diff --cc log-tree.c
Simple merge