From owner-svn-src-head@FreeBSD.ORG Tue Jan 6 19:17:51 2009 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74F7C1065672 for ; Tue, 6 Jan 2009 19:17:51 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id 08D808FC26 for ; Tue, 6 Jan 2009 19:17:51 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 21105 invoked by uid 399); 6 Jan 2009 19:17:50 -0000 Received: from localhost (HELO ?192.168.0.4?) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 6 Jan 2009 19:17:50 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4963AE5B.8040002@FreeBSD.org> Date: Tue, 06 Jan 2009 11:17:47 -0800 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: obrien@FreeBSD.org References: <200901011055.n01AtQaN052763@svn.freebsd.org> <495DB15B.8040908@FreeBSD.org> <495DB9B6.4030801@FreeBSD.org> <495DC5AF.3050908@FreeBSD.org> <495E91F8.3010706@FreeBSD.org> <18782.37537.775290.682466@hergotha.csail.mit.edu> <495E9E4B.8030905@FreeBSD.org> <18782.40912.247441.716938@hergotha.csail.mit.edu> <49628DD3.8020901@FreeBSD.org> <20090106164052.GC75326@dragon.NUXI.org> In-Reply-To: <20090106164052.GC75326@dragon.NUXI.org> X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn: head/usr.sbin/mergemaster X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jan 2009 19:17:52 -0000 David O'Brien wrote: > On Mon, Jan 05, 2009 at 02:46:43PM -0800, Doug Barton wrote: >> A few more specifics in no particular order: > .. >> You don't have to page through the whole diff if you use less as your PAGER. > > You do thought have to hit 'q' don't you? Only if you are not using the -U option (or if there are differences in a file where you have local edits). >> Matt Dillon's change to the PAGER was the single thing I got the most >> user complaints about. > > :-( I know I saw others say in email they liked it better... a > ~/.mergemasterrc knob would be nice. :-) /me waves his magic wand ..... voila! Put PAGER in your mergemaster rc file and it will work for you. (I'm guessing you haven't actually tried it ...) Doug -- This .signature sanitized for your protection