Git: uses separate 'light' emacs as merge tool, since Ediff is a bit messy with
     Git (does not quit properly, C-g messes everything up).