mergemaster merge left/right

Dominic Fandrey kamikaze at
Fri Jul 3 09:21:44 UTC 2009

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.

More information about the freebsd-stable mailing list