>
> 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(
+
--END GEEK CODE BLOCK--
> -Original Message-
> From: [EMAIL PROTECTED]
> [mailto:[EMAIL PROTECTED]]On Behalf Of Josef Karthauser
> Sent: Thursday, September 21, 2000 12:45 PM
> To: Brian Somers
> Cc: Christian Weisgerber; [EMAIL PROTECTED]
> Subject: Re: mergema
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 al
> Brian Somers <[EMAIL PROTECTED]> wrote:
>
> > > First, the things I am definitely going to do. Christian "naddy"
> > > Weisgerber has taken on the task of porting mm to openbsd.
> >
> > I think it would be nice to aim to keep the two scripts exactly the
> > same, using `uname` when it's rea
Brian Somers <[EMAIL PROTECTED]> wrote:
> > First, the things I am definitely going to do. Christian "naddy"
> > Weisgerber has taken on the task of porting mm to openbsd.
>
> I think it would be nice to aim to keep the two scripts exactly the
> same, using `uname` when it's really necessar
"Aleksandr A.Babaylov" wrote:
>
> Doug Barton writes:
> ..
> > And the last of the ideas I want feedback on is related to the problem
> > of determining permissions on the files to be installed. To my knowledge
> > there is no existing C utility that will tell you the octal permissi
Doug Barton writes:
..
> And the last of the ideas I want feedback on is related to the problem
> of determining permissions on the files to be installed. To my knowledge
> there is no existing C utility that will tell you the octal permissions
ports/sysutils/stat, for example
0cicu
[.]
> First, the things I am definitely going to do. Christian "naddy"
> Weisgerber has taken on the task of porting mm to openbsd. He has made
> some very reasonable requests that will make his life easier and reduce
> gratuitous differences between versions. Also, several people have a
Greetings campers,
Mergemaster first made its appearance as a port two years ago tomorrow,
and became part of the FreeBSD source tree last October 20th. Lots of
things have changed since the original version of the program (or
script, whatever), and there are some proposals on the board f
9 matches
Mail list logo
