From: Alan Chandler Date: Fri, 01 Dec 2006 08:13:40 GMT Subject: Re: Resolving conflicts Message-ID: <200612010813.41001.alan@chandlerfamily.org.uk> In-Reply-To: On Friday 01 December 2006 08:00, Linus Torvalds wrote: > 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.. Ubuntu is a Debian based. I think it uses Synaptic as its package manager gui with the standard Debian apt-xxx tools underneath. -- Alan Chandler