Default UE4 Merge Tool

[arbitrillion]

you can choose a 3rd-party diff tool now, ref: Diffing Unreal Assets - Unreal Engine