Date: Mon, 13 Jul 2009 18:39:22 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@spoerlein.net> To: Dominic Fandrey <kamikaze@bsdforen.de> Cc: freebsd-stable@freebsd.org Subject: Re: mergemaster merge left/right Message-ID: <20090713163922.GM2145@acme.spoerlein.net> In-Reply-To: <4A4DC67C.3010804@bsdforen.de> References: <4A4DC67C.3010804@bsdforen.de>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090713163922.GM2145>