Most of the modern revision systems don't try to do the 3-way merge
themselves, since there are plenty of tools to do it. There's always
the
Perforce approach, which seems to be to implement everything itself,
only
poorly. Even the diff output it generates has to be mangled before it
is
valid input for patch.
Dave
From a developer's POV you're right, but it's an oversimplification.
Many
merges can and should be resolved by "accept theirs" or "accept mine."
In defence of Perforce, you can replace their default diff and merge tools
with whatever you want, you're not tied to what they provide.
Also, Perforce's 'diff2' app with a '-u' switch should provide you with
output that can be properly digested by 'patch'.
-Matt
--
[email protected]
http://www.kernel-panic.org/cgi-bin/mailman/listinfo/kplug-list
