Up to now I used emacs ediff mode for merging. I tried meld, but could not find a way to make one buffer/file read only. I never merge in two directions, that's way I make one part read only before merging.