From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Jun 2010 05:42:26 GMT
Subject: Re: [PATCH 0/4] git --paginate: do not commit pager choice too early
Message-ID: <7vpqzacs3h.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100626192203.GA19973@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

> Patch is against master.  There is a small semantic conflict with
> jn/grep-open: SIMPLEPAGER should be changed to SIMPLEPAGERTTY in the
> prerequisites for the test_default_pager function.  Please let me
> know if I should push a merge commit to help resolve that.

Thanks for advance warning; please double check the merge result in 'pu'
when I push it out...