Date: Fri, 03 Jul 2009 10:51:08 +0200 From: Dominic Fandrey <kamikaze@bsdforen.de> To: freebsd-stable@freebsd.org Subject: mergemaster merge left/right Message-ID: <4A4DC67C.3010804@bsdforen.de>
next in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A4DC67C.3010804>