From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jason F. McBrayer" Subject: =?UTF-8?B?UmU6IEt1ZG9zIHRvIEF1csOpbGllbnMgYW5kIEFuZHJldyB3aG8g?= =?UTF-8?B?ZmluaXNoZWQgdGhlIEdTb0Mgc3VjY2Vzc2Z1bGx5IQ==?= Date: Wed, 29 Aug 2012 08:28:15 -0400 Message-ID: References: <876288b78d.fsf@altern.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([208.118.235.92]:55725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6hNc-0007eZ-IK for emacs-orgmode@gnu.org; Wed, 29 Aug 2012 08:28:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T6hNY-0007xe-F4 for emacs-orgmode@gnu.org; Wed, 29 Aug 2012 08:28:20 -0400 Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.120]:22393) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6hNY-0007xY-Au for emacs-orgmode@gnu.org; Wed, 29 Aug 2012 08:28:16 -0400 In-Reply-To: <876288b78d.fsf@altern.org> 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: emacs-orgmode@gnu.org On 24.08.2012 12:11, Bastien wrote: > Andrew's Org Merge driver (put your own favorite music): > http://www.youtube.com/watch?v=GbaaFmoEfGw I'm fairly excited about the Org merge driver. It seems like a lot of the conflicts I get in merging my work and home repositories are things that a syntax-aware merge tool would handle correctly. I'm excited to see that it also works with Mercurial! -- +-----------------------------------------------------------+ | Jason F. McBrayer jmcbray@carcosa.net | | If someone conquers a thousand times a thousand others in | | battle, and someone else conquers himself, the latter one | | is the greatest of all conquerors. --- The Dhammapada |