[emacs,git] Added ediff, emerge in git config.