I can't get my head around KDiff3 or Beyond Compare in the merge mode. Is there any tutorial to this feature?
Here's a video showing how to use Beyond Compare to merge files. It was given as part of Embarcadero's CodeRage 5 conference, so it covers a lot of general usage as well. The merge part begins at about 13:00.