Skip to content

Instantly share code, notes, and snippets.

@rlb3

rlb3/gitconfig

Created January 16, 2012 15:25
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save rlb3/1621361 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save rlb3/1621361 to your computer and use it in GitHub Desktop.
Download ZIP
ediff as a git merge tool
Raw
gitconfig
[mergetool.ediff]
cmd = /opt/emacs24/bin/emacs -q --eval \"(progn (defun ediff-write-merge-buffer () (let ((file ediff-merge-store-file)) (set-buffer ediff-buffer-C) (writ\
e-region (point-min) (point-max) file) (message \\\"Merge buffer saved in: %s\\\" file) (set-buffer-modified-p nil) (sit-for 1))) (setq ediff-quit-hook 'kill\
-emacs ediff-quit-merge-hook 'ediff-write-merge-buffer) (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment