[Zardoz84]

I try a few times, and always I get back to kdiff3. I feel less confuse with the 3 way view and separated merge output view.