Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graph
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Apr 2012 16:28:00 +0000 (09:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Apr 2012 16:28:00 +0000 (09:28 -0700)
By Zbigniew Jędrzejewski-Szmek
* zj/mksh-columns-breakage:
  test-lib: skip test with COLUMNS=1 under mksh

1  2 
t/test-lib.sh

diff --cc t/test-lib.sh
Simple merge