From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Apr 2012 16:28:00 +0000 (-0700)
Subject: Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graph
X-Git-Tag: v1.7.10.2~20^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d4958d30f851a70905b291ee9b996232e8db48e2

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
---

d4958d30f851a70905b291ee9b996232e8db48e2