Skip to content

Instantly share code, notes, and snippets.

@zecho

zecho/ediff.sh

Forked from redguardtoo/ediff.sh
Created August 18, 2023 13:08
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save zecho/cf8a79d9025953d20d5111313e9b1b6a to your computer and use it in GitHub Desktop.
Save zecho/cf8a79d9025953d20d5111313e9b1b6a to your computer and use it in GitHub Desktop.
Download ZIP
Use Emacs in ediff to resolve vcs conflicts
Raw
ediff.sh
#!/bin/sh
[ -z "$MYEMACSCLIENT" ] && MYEMACSCLIENT="emacs"
# $1=$BASE, $2=$LOCAL, $3=$REMOTE, $4=$MERGED
if [ "$MYEMACSCLIENT" = "emacs" ]; then
$MYEMACSCLIENT -nw -Q --eval "(setq startup-now t)" -l "$HOME/.emacs.d/init.el" --eval "(progn (setq ediff-quit-hook 'kill-emacs) (if (file-readable-p \"$3\") (ediff-merge-files-with-ancestor \"$1\" \"$2\" \"$3\" nil \"$4\") (ediff-merge-files \"$2\" \"$3\" nil \"$4\")))"
else
$MYEMACSCLIENT -nw --eval "(progn (setq ediff-quit-hook 'kill-emacs) (if (file-readable-p \"$3\") (ediff-merge-files-with-ancestor \"$1\" \"$2\" \"$3\" nil \"$4\") (ediff-merge-files \"$2\" \"$3\" nil \"$4\")))"
fi
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment