Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graph
commitd4958d30f851a70905b291ee9b996232e8db48e2
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Apr 2012 16:28:00 +0000 (27 09:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Apr 2012 16:28:00 +0000 (27 09:28 -0700)
tree6841915fbda58359d33476cc198e4f3eb4d2089a
parent678c5741118729dc9072182bd368e0a3402dd4f1
parentb082687cbac951d31bdea346404db5d0b99a0b73
Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graph

By Zbigniew JÄ™drzejewski-Szmek
* zj/mksh-columns-breakage:
  test-lib: skip test with COLUMNS=1 under mksh
t/test-lib.sh