3 ms·the built-in 3-way merge tool will do that... just set it up to be called from your favourite VCS.by TickleSteve 9y agothe built-in 3-way merge tool will do that... just set it up to be called from your favourite VCS.