> "merge" does a better job than "diff3" since it can resolve the
The merge command I know of is part of Tichy's RCS tools,
and calls diff3, and has no inherent superior abilities.
Is this the merge command you have in mind here?
--
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <[EMAIL PROTECTED]> 1.650.933.1373,
1.925.600.0401
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
