From owner-freebsd-stable@FreeBSD.ORG  Mon Jul 13 16:39:27 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 7E1FE106564A
	for <freebsd-stable@freebsd.org>; Mon, 13 Jul 2009 16:39:27 +0000 (UTC)
	(envelope-from uqs@spoerlein.net)
Received: from acme.spoerlein.net (cl-43.dus-01.de.sixxs.net
	[IPv6:2a01:198:200:2a::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D0CD8FC16
	for <freebsd-stable@freebsd.org>; Mon, 13 Jul 2009 16:39:26 +0000 (UTC)
	(envelope-from uqs@spoerlein.net)
Received: from acme.spoerlein.net (localhost.spoerlein.net [127.0.0.1])
	by acme.spoerlein.net (8.14.3/8.14.3) with ESMTP id n6DGdMYC075461
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Mon, 13 Jul 2009 18:39:23 +0200 (CEST)
	(envelope-from uqs@spoerlein.net)
Received: (from uqs@localhost)
	by acme.spoerlein.net (8.14.3/8.14.3/Submit) id n6DGdMpG075460;
	Mon, 13 Jul 2009 18:39:22 +0200 (CEST)
	(envelope-from uqs@spoerlein.net)
Date: Mon, 13 Jul 2009 18:39:22 +0200
From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@spoerlein.net>
To: Dominic Fandrey <kamikaze@bsdforen.de>
Message-ID: <20090713163922.GM2145@acme.spoerlein.net>
Mail-Followup-To: Dominic Fandrey <kamikaze@bsdforen.de>,
	freebsd-stable@freebsd.org
References: <4A4DC67C.3010804@bsdforen.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <4A4DC67C.3010804@bsdforen.de>
User-Agent: Mutt/1.5.20 (2009-06-14)
Cc: 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: Mon, 13 Jul 2009 16:39:27 -0000

On Fri, 03.07.2009 at 10:51:08 +0200, Dominic Fandrey 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.
> 
> Like this I have no idea which one to pick.

When using X, maximize your xterm horizontally and use mergemaster -w100
or something like that. It will probe the tty again and offer the "real"
width, so I usually just run mergemaster -w1 and hit enter.

hth,
Ulrich Spörlein