From owner-freebsd-stable Tue Oct 15 11:52: 0 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 87D4737B401 for ; Tue, 15 Oct 2002 11:51:59 -0700 (PDT) Received: from boredom.ennui.org (boredom.ennui.org [216.101.146.219]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3887843E7B for ; Tue, 15 Oct 2002 11:51:59 -0700 (PDT) (envelope-from rone@ennui.org) Received: by boredom.ennui.org (Postfix, from userid 5150) id 749B826E2E; Tue, 15 Oct 2002 11:51:57 -0700 (PDT) Subject: Re: Some Changes to Mergemaster In-Reply-To: <200210151757.g9FHvxQY061069@sep.oldach.net> To: freebsd-stable@freebsd.org Date: Tue, 15 Oct 2002 11:51:57 -0700 (PDT) X-URL: http://ennui.org/rone/ X-Mailer: ELM [version 2.4ME+ PL99b (25)] MIME-Version: 1.0 Message-Id: <20021015185157.749B826E2E@boredom.ennui.org> From: rone@ennui.org (definitely what) 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 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. rone -- New from the makers of Li'l Swimmers: Li'l Eaters. Edible underwear that looks just like Mommy's and Daddy's! - Kibo To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message