From owner-freebsd-stable Tue Oct 15 8:48:13 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 44F0937B401 for ; Tue, 15 Oct 2002 08:48:12 -0700 (PDT) Received: from lurza.secnetix.de (lurza.secnetix.de [212.66.1.130]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6603343E88 for ; Tue, 15 Oct 2002 08:48:11 -0700 (PDT) (envelope-from olli@lurza.secnetix.de) Received: from lurza.secnetix.de (localhost [IPv6:::1]) by lurza.secnetix.de (8.12.5/8.12.5) with ESMTP id g9FFmAmC071034 for ; Tue, 15 Oct 2002 17:48:10 +0200 (CEST) (envelope-from oliver.fromme@secnetix.de) Received: (from olli@localhost) by lurza.secnetix.de (8.12.5/8.12.5/Submit) id g9FFm9l2071033; Tue, 15 Oct 2002 17:48:09 +0200 (CEST) Date: Tue, 15 Oct 2002 17:48:09 +0200 (CEST) Message-Id: <200210151548.g9FFm9l2071033@lurza.secnetix.de> From: Oliver Fromme To: freebsd-stable@FreeBSD.ORG Reply-To: freebsd-stable@FreeBSD.ORG Subject: Re: Some Changes to Mergemaster In-Reply-To: <200210142214.g9EMEBPm005321@apollo.backplane.com> X-Newsgroups: list.freebsd-stable User-Agent: tin/1.5.4-20000523 ("1959") (UNIX) (FreeBSD/4.6-STABLE (i386)) MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit 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 Matthew Dillon wrote: > (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, depending > on the size of the diff, making it difficult to quickly run > through the vast majority of mergemaster files that you would > normally just replace, e.g. /etc/defaults/*, /etc/rc* (for most > people) and do not need to see the full diff. Will there be an option to always use $PAGER? I prefer that mode of operation (and I guess it would take some time to get my fingers used to anything else). Regards Oliver -- Oliver Fromme, secnetix GmbH & Co KG, Oettingenstr. 2, 80538 München Any opinions expressed in this message may be personal to the author and may not necessarily reflect the opinions of secnetix in any way. "All that we see or seem is just a dream within a dream" (E. A. Poe) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message