From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Schulte Subject: Re: Participating in Google Summer of Code 2012 Date: Fri, 02 Mar 2012 09:56:14 -0700 Message-ID: <87y5rjlz69.fsf@gmx.com> References: <877gz31kbo.fsf@gnu.org> <81wr73x803.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:38607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3VmS-0003or-Km for emacs-orgmode@gnu.org; Fri, 02 Mar 2012 11:56:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S3VmQ-0003Mm-DO for emacs-orgmode@gnu.org; Fri, 02 Mar 2012 11:56:32 -0500 Received: from mailout-us.gmx.com ([74.208.5.67]:46946) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1S3VmQ-0003Mi-5d for emacs-orgmode@gnu.org; Fri, 02 Mar 2012 11:56:30 -0500 In-Reply-To: <81wr73x803.fsf@gmail.com> (Jambunathan K.'s message of "Fri, 02 Mar 2012 22:20:04 +0530") 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: Jambunathan K Cc: emacs-orgmode@gnu.org Jambunathan K writes: > "Git merge tool for Org files" > > http://lists.gnu.org/archive/html/emacs-orgmode/2011-08/msg00601.html > Interesting, along these lines, I know git is able to use custom diffs (e.g., there exist sentence rather than line-based diffs for writing prose). I wonder if an outline diff would be useful, so that re-ordering subtrees in an Org-mode file was represented as a single operation rather than many un-related deletions and insertions. -- Eric Schulte http://cs.unm.edu/~eschulte/