Alan Schmitt <alan.schm...@polytechnique.org> writes:
> devn...@karl-voit.at writes:
>
>> Unison does not offer any merge functionality. However, you can
>> easily use third party tools to handle merge conflicts (Emacs, vim,
>> ...).
>
> (Disclaimer, I participate in Unison's development). Just to clarify
> what I think Karl is saying: one can plug in external tools to handle
> merge into unison, these tools can be specialized depending on the file
> name (for instance the file extension) or the file path. Getting the
> correct configuration line may be tricky, but I, or people on the
> unison-users mailing list, are ready to help.
For me, this line in unison configuration file
merge = Name {,.}* -> emacs --eval '(ediff-merge-files "CURRENT1" "CURRENT2"
nil "NEW")'
opens a new emacs frame with ediff for merging. You should change the
"Name {,.}$" part though (I should too...) to only use this on the files
you want to.
