From owner-freebsd-hackers Thu Sep 21 13:10:13 2000 Delivered-To: freebsd-hackers@freebsd.org Received: from Awfulhak.org (tun.AwfulHak.org [194.242.139.173]) by hub.freebsd.org (Postfix) with ESMTP id 8BDB537B43C for ; Thu, 21 Sep 2000 13:10:06 -0700 (PDT) Received: from hak.lan.Awfulhak.org (root@hak.lan.awfulhak.org [172.16.0.12]) by Awfulhak.org (8.11.0/8.11.0) with ESMTP id e8LK5sv68414; Thu, 21 Sep 2000 21:05:54 +0100 (BST) (envelope-from brian@hak.lan.Awfulhak.org) Received: from hak.lan.Awfulhak.org (brian@localhost [127.0.0.1]) by hak.lan.Awfulhak.org (8.11.0/8.11.0) with ESMTP id e8LK1Fs84072; Thu, 21 Sep 2000 21:01:15 +0100 (BST) (envelope-from brian@hak.lan.Awfulhak.org) Message-Id: <200009212001.e8LK1Fs84072@hak.lan.Awfulhak.org> X-Mailer: exmh version 2.1.1 10/15/1999 To: Josef Karthauser , Brian Somers , Christian Weisgerber , freebsd-hackers@FreeBSD.ORG Subject: Re: mergemaster RFC (long) In-Reply-To: Message from Josef Karthauser of "Thu, 21 Sep 2000 18:44:49 BST." <20000921184449.K1694@pavilion.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 21 Sep 2000 21:01:15 +0100 From: Brian Somers Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG > > Another thing that would be very useful is that during a > merge of two files that it's possible to specify both > the left hand side and the right hand side. That would > fix cases like: > > Orig: > > # $FreeBSD: src/etc/shells,v 1.4 SOMEDATE$ > # > # List of acceptable shells for chpass(1). > # Ftpd will not allow users to connect who are not using > # one of these shells. > > /bin/sh > /bin/csh > /usr/local/bin/zsh > > > The new 1.5 version has: /bin/tcsh in it. Mergemaster won't let > me have both my /usr/local/bin/zsh and the /bin/tcsh. During merge > I can have either but not both :( > > Joe You can ``e b'' (edit both) from the sdiff prompt. -- Brian Don't _EVER_ lose your sense of humour ! To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message