Hi Bill, On Thu, Oct 14, 2010 at 3:57 PM, Bill Lorensen <bill.lorensen at gmail.com> wrote: > Does anyone have the magic mojo to make xemacs(emacs)'s ediff as a git > mergetool? > Maybe here? http://stackoverflow.com/questions/1817370/ediff-as-mergetool Matt