For windows, the best choice is BeyondCompare. If you want it free - take WinMerge. Under Unix, the best choice is Meld which is written in python, thus being also the only cross-platform alternative of the three.
All these tools support 2-way folder comparison which is what you seem to need here.