On Thu, 30 Nov 2006, Linus Torvalds wrote:
quoted text
> 
> 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..

		Linus
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html