On Thu, Apr 04, 2002 at 11:28:31PM -0800 I heard the voice of
James Long, and lo! it spake thus:
>
> How can I tell mergemaster something like, "insert the left alternative
> first, followed by the right alternative" or vice versa, right first, then
> left? Must I just edit the file(s) manually?
On Fri, 2002-04-05 at 02:28, James Long wrote:
> How can I tell mergemaster something like, "insert the left alternative
> first, followed by the right alternative" or vice versa, right first, then
> left? Must I just edit the file(s) manually?
mergemaster just uses "sdiff -o", so anything you c
On Friday 05 April 2002 09:11, Brooks Davis wrote:
> > What have happened hw.atamodes?
> It was replaced by atacontrol(8) in -current and -stable.
Ok, seems like the man-pages for ata needs to be updated then ;)
Bjarne
--
Homepage: http://www.mekanix.dk
To Unsubscribe: send mail to [EMAIL PRO
In doing some merges lately, I've gotten into situations where mergemaster
gives me a choice between old lines I want to keep on the left, and new
lines which I want to add on the right. A specific example was in merging
my /etc/group and /etc/passwd files, I had the choice between some existing
