The windows tool Beyond Compare is exceptional for passing huge directory trees and hi highlighting the conflicts, letting you drill into the file content and insoect line-level changes (assuming the content is understood, does OK with images and documents but certainly better with text, code/scripts)