I wish there was something like this for resolving merge conflicts. Every mergetool I use frustrates me. I managed to crack emerge a few months ago, but when I

I wish there was something like this for resolving merge conflicts. Every mergetool I use frustrates me. I managed to crack emerge a few months ago, but when I needed to use it again yesterday, it was completely opaque again so I resorted to doing it manually. Kdiff wouldn’t actually do anything to the file, just saved and then immediately put me back to square one.