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. _______________________________________________ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
