Beyond Compare is an *excellent* tool and certainly what I use for this type of task.