From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Subject: Re: Line breaks in org-mode having version control in mind Date: Mon, 04 Nov 2013 12:23:17 +0100 Message-ID: <87wqko9zru.fsf@bzg.ath.cx> References: Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdIFi-00008R-Te for Emacs-orgmode@gnu.org; Mon, 04 Nov 2013 06:23:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdIFd-0001p7-7b for Emacs-orgmode@gnu.org; Mon, 04 Nov 2013 06:23:26 -0500 Received: from mail-wg0-x229.google.com ([2a00:1450:400c:c00::229]:63611) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdIFd-0001ov-0b for Emacs-orgmode@gnu.org; Mon, 04 Nov 2013 06:23:21 -0500 Received: by mail-wg0-f41.google.com with SMTP id b13so1645231wgh.0 for ; Mon, 04 Nov 2013 03:23:20 -0800 (PST) In-Reply-To: (Dror Atariah's message of "Sun, 3 Nov 2013 21:28:09 +0100") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Dror Atariah Cc: Emacs-orgmode@gnu.org Hi Dror, Dror Atariah 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