From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Hendy Subject: =?UTF-8?B?UmU6IEt1ZG9zIHRvIEF1csOpbGllbnMgYW5kIEFuZHJldyB3aG8g?= =?UTF-8?B?ZmluaXNoZWQgdGhlIEdTb0Mgc3VjY2Vzc2Z1bGx5IQ==?= Date: Wed, 29 Aug 2012 09:33:42 -0500 Message-ID: References: <876288b78d.fsf@altern.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from eggs.gnu.org ([208.118.235.92]:34514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6jL3-0004F1-9y for emacs-orgmode@gnu.org; Wed, 29 Aug 2012 10:33:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T6jKx-00062A-DR for emacs-orgmode@gnu.org; Wed, 29 Aug 2012 10:33:49 -0400 Received: from mail-vc0-f169.google.com ([209.85.220.169]:53228) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6jKx-000622-9T for emacs-orgmode@gnu.org; Wed, 29 Aug 2012 10:33:43 -0400 Received: by vcbfl13 with SMTP id fl13so822909vcb.0 for ; Wed, 29 Aug 2012 07:33:42 -0700 (PDT) In-Reply-To: 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: "Jason F. McBrayer" Cc: emacs-orgmode@gnu.org On Wed, Aug 29, 2012 at 7:28 AM, Jason F. McBrayer wrote: > 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! > Flipping awesome video. I don't really edit from multiple locations, but I can see how this will help tremendously with org-mode collaboration. Thanks for posting! John > -- > +-----------------------------------------------------------+ > | 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 | > >