3-way merge is a welcome feature ... can't wait for a 3-way directory merge feature.

I have used Araxis Merge and Guiffy as well and they...