Skip to content

Instantly share code, notes, and snippets.

@zbeekman

zbeekman/gist:948755

Created April 29, 2011 18:22
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 zbeekman/948755 to your computer and use it in GitHub Desktop.
Save zbeekman/948755 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.el
(ediff-merge-files-with-ancestor file-a file-b file-ancestor &optional
startup-hooks merge-buffer-file)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment