mergemaster merge left/right
uqs at spoerlein.net
Mon Jul 13 16:39:27 UTC 2009
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.
More information about the freebsd-stable