Date: Thu, 21 Sep 2000 21:01:15 +0100 From: Brian Somers <brian@Awfulhak.org> To: Josef Karthauser <joe@pavilion.net>, Brian Somers <brian@Awfulhak.org>, Christian Weisgerber <naddy@mips.inka.de>, freebsd-hackers@FreeBSD.ORG Subject: Re: mergemaster RFC (long) Message-ID: <200009212001.e8LK1Fs84072@hak.lan.Awfulhak.org> In-Reply-To: Message from Josef Karthauser <joe@pavilion.net> of "Thu, 21 Sep 2000 18:44:49 BST." <20000921184449.K1694@pavilion.net>
next in thread | previous in thread | raw e-mail | index | archive | help
>
> 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 <brian@Awfulhak.org> <brian@[uk.]FreeBSD.org>
<http://www.Awfulhak.org>; <brian@[uk.]OpenBSD.org>
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200009212001.e8LK1Fs84072>