mergemaster merge left/right

From

Dominic Fandrey <kamikaze@bsdforen.de>

Date

3 Jul 2009 09:21:44

Subject

mergemaster merge left/right

Message-ID

4A4DC67C.3010804@bsdforen.de

Replies

Dan Naumov, Cristiano Deana, Robert Noland, Ulrich Spörlein

Referenced by

Dan Naumov, Cristiano Deana, Dominic Fandrey, Robert Noland, Dominic Fandrey, Lawrence Stewart, Ulrich Spörlein, Doug Barton

[ Hide this part ]

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.