Git version control scripts ediff-merge-script A script for use as a git mergetool; runs Emacs ediff as the mergetool. Documentation at top of file.