Permalink
Find file
Fetching contributors…
Cannot retrieve contributors at this time
3 lines (2 sloc) 89 Bytes
#!/bin/bash
emacsclient -e "(ediff-merge-with-ancestor \"$1\" \"$2\" \"$3\" nil \"$4\")"