Alan Schmitt <alan.schm...@polytechnique.org> writes:
>> Alan, how about a short how-to on Worg about Unison and Org-mode
>> methods?
>
> Well, what would be there? If there is (and there may be) an external
> tool that knows how to merge org files (it can be a 3-way merge, if it
> makes things simpler), I could try to devise the magical incantation to
> use it.
There's the GSOC project from last year:
http://orgmode.org/cgit.cgi/org-merge-driver.git
Whether it is complete or abandoned I don't know. Here's the Worg
page
http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/index.html
–Rasmus
--
If you can mix business and politics wonderful things can happen!
