* Alan Schmitt <alan.schm...@polytechnique.org> wrote: > 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).
Jay! \o/ > 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. Of course. Thanks for clarifying! Alan, how about a short how-to on Worg about Unison and Org-mode methods? -- mail|git|SVN|photos|postings|SMS|phonecalls|RSS|CSV|XML to Org-mode: > get Memacs from https://github.com/novoid/Memacs < https://github.com/novoid/extract_pdf_annotations_to_orgmode + more on github