svn: head/usr.sbin/mergemaster

[Doug Barton]

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