On Wed, Aug 29, 2012 at 7:28 AM, Jason F. McBrayer <jmcb...@carcosa.net> 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 jmcb...@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 | > >
