I'd like to invoke emacs'
ediff-merge-files function for merging files with the unison file synchronizer. To avoid starting a new instance, I prefer using
emacsclient --eval '(ediff-merge-files "CURRENT1" "CURRENT2" nil "NEW")'
emacsclient returns instantly (as it would do when given plain files and the
--no-wait option). Of course, unison then complains that no files have been edited.
Is there a way to let emacsclient wait until I'm finished with the merge?