Using Emacs Ediff as Git Merge/Difftool