Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Oct 2002 09:29:46 +0200 (CEST)
From:      Helge Oldach <15oct02@oldach.net>
To:        rone@ennui.org (definitely what)
Cc:        freebsd-stable@FreeBSD.ORG
Subject:   Re: Some Changes to Mergemaster
Message-ID:  <200210160729.g9G7TkYJ067721@sep.oldach.net>
In-Reply-To: <20021015185157.749B826E2E@boredom.ennui.org> from definitely what at "Oct 15, 2002 11:51:57 am"

next in thread | previous in thread | raw e-mail | index | archive | help
definitely what:
> Helge Oldach writes:
>   Matthew Dillon:
>   >     (2) Initial diff does not use the pager and chops it to fit on a single
>   > 	screen.  This fixes the problem where you would sometimes be left
>   > 	in the pager and sometimes not be left in the pager
>   
>   What you really want to do is to use less(1) as the PAGER, add the -c
>   option for case (1), and possibly remove the -e option for case (2). No
>   need to change anything about mergemaster to achieve this.
> 
> You can "setenv LESS '-E'" to achieve a more-like end to less.

Actually Matt would *not* want to use -E or -e because he wants a
consistent state (either being left *in* the pager or not, regardless of
the length of the diff).

Helge

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210160729.g9G7TkYJ067721>