I've doing diff3 like merges with emacs for more than 10 years. It works like a charm, especially since the emacs frontend shows diff's on a character base as well. »