From: Linus Torvalds <torvalds@osdl.org>
Date: Fri, 01 Dec 2006 08:00:43 GMT
Subject: Re: Resolving conflicts
Message-ID: <Pine.LNX.4.64.0611302359400.3695@woody.osdl.org>
In-Reply-To: <Pine.LNX.4.64.0611302353580.3695@woody.osdl.org>



On Thu, 30 Nov 2006, Linus Torvalds wrote:
> 
> No, kdiff3 probably doesn't have the same semantics, so better get the 
> "real" merge. It's almost certainly in the rcs package, so "emerge rcs" 
> should do it.

..and just to be safe, remove the symlink first, so that you don't end up 
overwriting the "kdiff3" binary by mistake when you install the real 
"merge". Not that I think emerge is quite that stupid a package manager, 
but anyway..