Permalink
Switch branches/tags
Nothing to show
Find file
Fetching contributors…
Cannot retrieve contributors at this time
executable file 6 lines (5 sloc) 189 Bytes
#!/bin/sh
#
# 3 way merge using emacs from the command line
# http://wiki.darcs.net/DarcsWiki/CategoryEmacs
amacs --eval="(ediff-merge-files-with-ancestor \"$1\" \"$2\" \"$3\" nil \"$4\")"