Re: mergemaster merge left/right

[ Available lists | Index of freebsd-stable | Month of Jul 2009 | Week of 3 Jul 2009 | Raw email | View thread | Wrap long lines | Reply | Tag ]
From
Dominic Fandrey <kamikaze@bsdforen.de>
Date
3 Jul 2009 14:25:52
Subject
Re: mergemaster merge left/right
Message-ID
4A4E14ED.5010309@bsdforen.de

In reply to
Referenced by

[ Hide this part ]
Robert Noland wrote:
> On Fri, 2009-07-03 at 10:51 +0200, Dominic Fandrey wrote:
>> I'd really like mergemaster to tell me whether the left
>> or the right side is the new file.
>>
>> # $FreeBSD: src/etc/devd.conf,v 1.38. | # $FreeBSD: src/etc/devd.conf,v 1.38.
>>
>> Like this I have no idea which one to pick.
>
> The right hand side is always the new file.

I know. Trial and error can tell you that. But I want
mergemaster to tell me.


Elapsed time: 0.146 seconds