[dikei]

Kdiff3 can absolutely do edit in place: just type directly in the merge output window and save the result as usual.