From owner-freebsd-stable@FreeBSD.ORG  Fri Jul  3 09:21:44 2009
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A4A5F106566C
	for <freebsd-stable@freebsd.org>; Fri,  3 Jul 2009 09:21:44 +0000 (UTC)
	(envelope-from kamikaze@bsdforen.de)
Received: from mail.bsdforen.de (bsdforen.de [212.204.60.79])
	by mx1.freebsd.org (Postfix) with ESMTP id 687668FC16
	for <freebsd-stable@freebsd.org>; Fri,  3 Jul 2009 09:21:44 +0000 (UTC)
	(envelope-from kamikaze@bsdforen.de)
Received: from mobileKamikaze.norad (unknown [88.130.209.0])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.bsdforen.de (Postfix) with ESMTP id 26FA38A032C
	for <freebsd-stable@freebsd.org>; Fri,  3 Jul 2009 10:51:09 +0200 (CEST)
Message-ID: <4A4DC67C.3010804@bsdforen.de>
Date: Fri, 03 Jul 2009 10:51:08 +0200
From: Dominic Fandrey <kamikaze@bsdforen.de>
User-Agent: Thunderbird 2.0.0.22 (X11/20090625)
MIME-Version: 1.0
To: freebsd-stable@freebsd.org
X-Enigmail-Version: 0.95.7
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: mergemaster merge left/right
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jul 2009 09:21:44 -0000

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.