mergemaster merge left/right

[Cristiano Deana]

On Fri, Jul 3, 2009 at 10:51 AM, Dominic Fandrey<kamikaze at bsdforen.de> 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.

"From" -> "To"

The new one is *always* the right one.

-- 
Cris, member of G.U.F.I
Italian FreeBSD User Group
http://www.gufi.org/