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.