From owner-freebsd-stable@FreeBSD.ORG  Tue Jul 14 04:33:55 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 2F0CA1065689
	for <freebsd-stable@freebsd.org>; Tue, 14 Jul 2009 04:33:55 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4])
	by mx1.freebsd.org (Postfix) with ESMTP id CD2708FC13
	for <freebsd-stable@freebsd.org>; Tue, 14 Jul 2009 04:33:52 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: (qmail 16062 invoked by uid 399); 14 Jul 2009 04:33:49 -0000
Received: from localhost (HELO ?192.168.0.100?) (dougb@dougbarton.us@127.0.0.1)
	by localhost with ESMTPAM; 14 Jul 2009 04:33:49 -0000
X-Originating-IP: 127.0.0.1
X-Sender: dougb@dougbarton.us
Message-ID: <4A5C0AAF.1090604@FreeBSD.org>
Date: Mon, 13 Jul 2009 21:33:51 -0700
From: Doug Barton <dougb@FreeBSD.org>
Organization: http://www.FreeBSD.org/
User-Agent: Thunderbird 2.0.0.22 (Windows/20090605)
MIME-Version: 1.0
To: Dominic Fandrey <kamikaze@bsdforen.de>, freebsd-stable@freebsd.org
References: <4A4DC67C.3010804@bsdforen.de>
	<20090713163922.GM2145@acme.spoerlein.net>
In-Reply-To: <20090713163922.GM2145@acme.spoerlein.net>
X-Enigmail-Version: 0.95.7
OpenPGP: id=D5B2F0FB
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
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: Tue, 14 Jul 2009 04:34:12 -0000

Ulrich Spörlein wrote:
> 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.

Making the window wider is good advice, but the -w option is not
needed. If you're running mergemaster in any sort of tty it will
automatically set the column width for sdiff for you.


hth,

Doug