On Wed, 18 Oct 2006, Linus Torvalds wrote: > As to why git uses "merge" - I have this strong memory of having seen > machines that had one but not the other, and that, along with the fact > that I've used "merge" personally, is why we call "merge" rather than > diff3. > > In Linux systems, "merge" usually comes with the RCS package, and "diff3" > is usually from "diffutils". It may be that "diff3" is more common. I'm > not sure what the history is, and what the situation would tend to be like > on other systems.. AFAICT, "merge" actually execs "diff3", so if a system has only one, either it's diff3, it's a "merge" from somewhere other than current rcs, or it doesn't actually work. -Daniel *This .sig left intentionally blank* - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html