Am Donnerstag, 29. Januar 2009 14:55:48 schrieb Hans Petter Jansson: ...
It's only this part that is missing from the tools (e.g. ocs), so someone should perhaps simply implement it.
Do you know how much work it's estimated to take?
When you use diff3 as tool it is not too much work, I guess. AFAIK also other scm's are using this one.
You just need to add functionality to checkout all three base versions and run the tool on them, I guess.