Merge branch 'zj/term-columns' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Feb 2012 23:00:15 +0000 (15:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Feb 2012 23:00:15 +0000 (15:00 -0800)
commitc17ff2a...6160ae51a1cefa9fe8f067dbeb33e884
tree1599544...005ae2df04dcbca7c43b1ab1988e52c4copy hash to clipboard (tree)
parent1e2545c...878665f2092940eab1aaeb20703f7d14copy hash to clipboard (diff)
parentad6c373...a33586ba15a8c5c245dcd59e8a31cef1copy hash to clipboard (diff)
cache.h