I would like to be able to use ediff with \"git mergetool\".
I found some patches that alter the source code, which I don\'t want to do. Instead, I\'d like to add ed
For using Subversion's interactive merge tool instead of git see this post for some instructions to set this up.