Skip to content

Instantly share code, notes, and snippets.

@bendlas
Created October 18, 2011 03:46
Show Gist options
  • Save bendlas/1294565 to your computer and use it in GitHub Desktop.
Save bendlas/1294565 to your computer and use it in GitHub Desktop.
A wrapper to use ediff-merge-files as a system merge tool
#!/bin/zsh
if [ ${#argv} -eq 3 ]; then
emacs -Q -nw --eval "(ediff-merge-files \"$2\" \"$3\" nil \"$1\")"
exit $?
fi
IFS=/
echo "Usage: ${${=0}[-1]} <merged-file> <old-file> <new-file>"
exit 1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment