From owner-freebsd-stable Wed Oct 16 0:30: 7 2002 Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CFF037B401 for ; Wed, 16 Oct 2002 00:30:06 -0700 (PDT) Received: from sep.oldach.net (sep.oldach.net [194.180.25.6]) by mx1.FreeBSD.org (Postfix) with ESMTP id D341D43E91 for ; Wed, 16 Oct 2002 00:30:04 -0700 (PDT) (envelope-from hmo@sep.oldach.net) Received: from sep.oldach.net (localhost [127.0.0.1]) by sep.oldach.net (8.12.6/8.12.6/hmo29jun02) with ESMTP id g9G7Tkv1067722 (version=TLSv1/SSLv3 cipher=EDH-DSS-DES-CBC3-SHA bits=168 verify=NO); Wed, 16 Oct 2002 09:29:46 +0200 (CEST) (envelope-from hmo@sep.oldach.net) Received: (from hmo@localhost) by sep.oldach.net (8.12.6/8.12.6/Submit) id g9G7TkYJ067721; Wed, 16 Oct 2002 09:29:46 +0200 (CEST) (envelope-from hmo) Message-Id: <200210160729.g9G7TkYJ067721@sep.oldach.net> Subject: Re: Some Changes to Mergemaster In-Reply-To: <20021015185157.749B826E2E@boredom.ennui.org> from definitely what at "Oct 15, 2002 11:51:57 am" To: rone@ennui.org (definitely what) Date: Wed, 16 Oct 2002 09:29:46 +0200 (CEST) Cc: freebsd-stable@FreeBSD.ORG From: Helge Oldach <15oct02@oldach.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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