Date: Mon, 13 Jul 2009 21:33:51 -0700 From: Doug Barton <dougb@FreeBSD.org> To: Dominic Fandrey <kamikaze@bsdforen.de>, freebsd-stable@freebsd.org Subject: Re: mergemaster merge left/right Message-ID: <4A5C0AAF.1090604@FreeBSD.org> In-Reply-To: <20090713163922.GM2145@acme.spoerlein.net> References: <4A4DC67C.3010804@bsdforen.de> <20090713163922.GM2145@acme.spoerlein.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A5C0AAF.1090604>