From owner-freebsd-stable@FreeBSD.ORG  Fri Jul  3 10:17:40 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 49C4D106566C
	for <freebsd-stable@freebsd.org>; Fri,  3 Jul 2009 10:17:40 +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 0A33D8FC1E
	for <freebsd-stable@freebsd.org>; Fri,  3 Jul 2009 10:17:40 +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 E138C8A032D;
	Fri,  3 Jul 2009 12:17:38 +0200 (CEST)
Message-ID: <4A4DDAB8.3080804@bsdforen.de>
Date: Fri, 03 Jul 2009 12:17:28 +0200
From: Dominic Fandrey <kamikaze@bsdforen.de>
User-Agent: Thunderbird 2.0.0.22 (X11/20090625)
MIME-Version: 1.0
To: Cristiano Deana <cristiano.deana@gmail.com>
References: <4A4DC67C.3010804@bsdforen.de>
	<d8a4930a0907030234v7359642ehe0cf2a86ad7ef6d4@mail.gmail.com>
In-Reply-To: <d8a4930a0907030234v7359642ehe0cf2a86ad7ef6d4@mail.gmail.com>
X-Enigmail-Version: 0.95.7
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: FreeBSD Stable Mailing List <freebsd-stable@freebsd.org>
Subject: Re: 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 10:17:40 -0000

Cristiano Deana wrote:
> On Fri, Jul 3, 2009 at 10:51 AM, Dominic Fandrey<kamikaze@bsdforen.de> wrote:
> 
>> 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.
> 
> "From" -> "To"
> 
> The new one is *always* the right one.

I don't have to merge files all that often. mergmaster is pretty easy to
use, apart from the lack of that information. It wouldn't be very hard to
print "<old file> | <new file>" at the beginning of a merge.