|
| From: | Bastien |
| Subject: | Re: [O] Line breaks in org-mode having version control in mind |
| Date: | Mon, 04 Nov 2013 12:23:17 +0100 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
Hi Dror, Dror Atariah <address@hidden> writes: > What other issues are there? What do you do when you keep > your org file under VC? Only a small part of the answer, but you might be interested in the Git Org merge driver: http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/ -- Bastien
| [Prev in Thread] | Current Thread | [Next in Thread] |