Date: Tue, 31 Aug 2004 09:58:25 +1000 (EST) From: "Sam Lawrance" <boris@brooknet.com.au> To: "Lars Erik Gullerud" <lerik@nolink.net> Cc: "freebsd-current@freebsd.org" <freebsd-current@freebsd.org> Subject: Re: suggestion for /usr/src/UPDATING Message-ID: <57506.134.148.20.1.1093910305.squirrel@134.148.20.1> In-Reply-To: <20040831011815.C40736-100000@electra.nolink.net> References: <20040830210817.GB749@galgenberg.net> <20040831011815.C40736-100000@electra.nolink.net>
next in thread | previous in thread | raw e-mail | index | archive | help
> On Mon, 30 Aug 2004, Ulrich Spoerlein wrote: > >> On Mon, 30.08.2004 at 09:31:06 -0700, David O'Brien wrote: >> > > mergemasters is gross. Have you ever tried to run it on an >> 80-column display? >> > > I absolutely hate the "left" "right" stuff. You push the "l" with >> your right >> > > hand and the "r" with your left for crying out loud. >> > >> > LOL!! >> >> This is not funny. I myself have to think loud about which button to >> press. 'r' is on the left keyboard side and 'l' is to the right. > > I second the "don't laugh" - you have no idea how many times I have to > select "redo the merge" when upgrading servers usually during a > late-night maintenance window, with a brain only functioning due to > large amounts of caffeine in the bloodstream... > > (Not that I have any suggestions for other keys to use, mind you - but > the mind's wiring does have a problem with getting used to pressing a > key with the left hand to select the right side of the screen and > vice versa...) I think it would be nice if the 'merge then edit' command merged entire files at once instead of just parts, cvs conflict style.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?57506.134.148.20.1.1093910305.squirrel>