emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Andrew Young <youngar17@gmail.com>
To: emacs-orgmode@gnu.org
Subject: [GSoC] org-merge-driver weekly update
Date: Wed, 30 May 2012 10:36:38 -0400	[thread overview]
Message-ID: <CAMvvmF8veZDh44bE03GVs8HwwDfFTej4nziUida_kWzSm6wBOg@mail.gmail.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 370 bytes --]

Hello everyone,

I would just like to let everyone know that a prototype for
org-merge-driver is available.  It is not complete, so of course please do
not use it for your repository! ;)

You can see some example use of it at the the worg project page:
http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/prototype.html

Sincerely,
Andrew Young

[-- Attachment #2: Type: text/html, Size: 574 bytes --]

next             reply	other threads:[~2012-05-30 14:36 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-30 14:36 Andrew Young [this message]
2012-05-30 17:15 ` [GSoC] org-merge-driver weekly update Carsten Dominik
2012-05-30 17:56   ` Bastien
2012-05-31  7:31   ` Andrew Young
2012-05-31  7:38     ` Carsten Dominik
2012-06-04 15:30       ` Robert Horn
2012-06-06 13:50         ` Andrew Young
2012-06-06 13:56           ` Carsten Dominik
2012-06-06 14:20             ` Robert Horn
  -- strict thread matches above, loose matches on Subject: below --
2012-06-17  2:15 Andrew Young

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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  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=CAMvvmF8veZDh44bE03GVs8HwwDfFTej4nziUida_kWzSm6wBOg@mail.gmail.com \
    --to=youngar17@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

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).