Two-way Folder Comparison and Merge

 

 

This screenshot demonstrate a sample view of 2-way folder merge: