mergemaster merge left/right
Doug Barton
dougb at FreeBSD.org
Tue Jul 14 04:34:12 UTC 2009
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
More information about the freebsd-stable
mailing list