Alan Schmitt <alan.schm...@polytechnique.org> writes: > 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.
It is not org-specific, but meld [1] is a Free and capable GUI merge tool. It can be used directly or can be invoked by git to resolve merge conflicts. -Brett. http://meldmerge.org/
pgpXrGc9cQ3V4.pgp
Description: PGP signature
