emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: "Jason F. McBrayer" <jmcbray@carcosa.net>
To: emacs-orgmode@gnu.org
Subject: Re: Kudos to Auréliens and Andrew who finished the GSoC successfully!
Date: Wed, 29 Aug 2012 08:28:15 -0400	[thread overview]
Message-ID: <e6207a2b2a04a2a8859f99847c0d894d@marie.carcosa.net> (raw)
In-Reply-To: <876288b78d.fsf@altern.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 |

  parent reply	other threads:[~2012-08-29 12:28 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-24 16:11 Kudos to Auréliens and Andrew who finished the GSoC successfully! Bastien
2012-08-25 12:26 ` Puneeth Chaganti
2012-08-27 16:15 ` Eric Schulte
2012-08-29 12:10   ` Aurélien Aptel
2012-08-29 17:26   ` Bastien
2012-08-29 22:39     ` Marcelo de Moraes Serpa
2012-08-29 12:28 ` Jason F. McBrayer [this message]
2012-08-29 14:33   ` John Hendy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e6207a2b2a04a2a8859f99847c0d894d@marie.carcosa.net \
    --to=jmcbray@carcosa.net \
    --cc=emacs-orgmode@gnu.org \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).