From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Young <youngar17@gmail.com>
Subject: [GSoC] org-merge-driver weekly update
Date: Wed, 30 May 2012 10:36:38 -0400
Message-ID: <CAMvvmF8veZDh44bE03GVs8HwwDfFTej4nziUida_kWzSm6wBOg@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/alternative; boundary=0016e6d99a9202327f04c141e109
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:35169)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <youngar17@gmail.com>) id 1SZk10-0006N7-Sd
	for emacs-orgmode@gnu.org; Wed, 30 May 2012 10:36:48 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <youngar17@gmail.com>) id 1SZk0v-0001yR-VU
	for emacs-orgmode@gnu.org; Wed, 30 May 2012 10:36:46 -0400
Received: from mail-we0-f169.google.com ([74.125.82.169]:55394)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <youngar17@gmail.com>) id 1SZk0v-0001tj-Mp
	for emacs-orgmode@gnu.org; Wed, 30 May 2012 10:36:41 -0400
Received: by wefh52 with SMTP id h52so4339518wef.0
	for <emacs-orgmode@gnu.org>; Wed, 30 May 2012 07:36:39 -0700 (PDT)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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

--0016e6d99a9202327f04c141e109
Content-Type: text/plain; charset=ISO-8859-1

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

--0016e6d99a9202327f04c141e109
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

<div>Hello everyone,</div><div><br></div><div>I would just like to let ever=
yone know that a prototype for org-merge-driver is available. =A0It is not =
complete, so of course please do not use it for your repository! ;)</div><d=
iv>
<br></div><div>You can see some example use of it at the the worg project p=
age:=A0<a href=3D"http://orgmode.org/worg/org-contrib/gsoc2012/student-proj=
ects/git-merge-tool/prototype.html">http://orgmode.org/worg/org-contrib/gso=
c2012/student-projects/git-merge-tool/prototype.html</a></div>
<div><br></div><div>Sincerely,</div><div>Andrew Young</div>

--0016e6d99a9202327f04c141e109--