Date: Tue, 06 Jan 2009 11:17:47 -0800 From: Doug Barton <dougb@FreeBSD.org> To: obrien@FreeBSD.org Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn: head/usr.sbin/mergemaster Message-ID: <4963AE5B.8040002@FreeBSD.org> In-Reply-To: <20090106164052.GC75326@dragon.NUXI.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>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4963AE5B.8040002>