Re: File compare/merge

[Jonas Drewsen]

In my experience p4merge from Perforce can resolve more conflicts 
automatically that many of the other tools I've tried.

/Jonas