[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] Re: "Newbie-ized help"

From: James Blackwell
Subject: Re: [Gnu-arch-users] Re: "Newbie-ized help"
Date: Mon, 27 Sep 2004 00:14:17 -0400

> star-merge --three-way is yet another bucket of worms -- I use it a
> lot, because I like the automatic resolution of duplicates, but when I
> have to fix a conflict, the style of conflicts it generates are quite
> often much more confusing than seeing diff-style .rej files.

Last I heard, I was supposed to take --three-way out, because as it
happens it doesn't work at all. There was a thread about 2-3 weeks ago
that was sponsored by ddaa.

The reason it was put in at al is that the docs are a little bit
confusing on the issue

James Blackwell          Try something fun: For the next 24 hours, give
Smile more!              each person you meet a compliment!

GnuPG (ID 06357400) AAE4 8C76 58DA 5902 761D  247A 8A55 DA73 0635 7400

reply via email to

[Prev in Thread] Current Thread [Next in Thread]