Cristiano Deana wrote: > On Fri, Jul 3, 2009 at 10:51 AM, Dominic Fandrey<[email protected]> 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.
I don't have to merge files all that often. mergmaster is pretty easy to use, apart from the lack of that information. It wouldn't be very hard to print "<old file> | <new file>" at the beginning of a merge. _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "[email protected]"
