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)
commitea8c6761e3605d18a438efea37660fd7a8ad0ce6
treebe1b9ed5bdf7f0630d07f7b564402345d1186a56
parenta912913e864ea67f4544d3fb4d52e20bd3a6075e
parentfafd38299bb6ff5634de89bcca35f622005d0279
Merge branch 'jk/maint-tformat-with-z' into maint

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
log-tree.c