From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jambunathan K <kjambunathan@gmail.com>
Subject: Re: Participating in Google Summer of Code 2012
Date: Fri, 02 Mar 2012 22:20:04 +0530
Message-ID: <81wr73x803.fsf@gmail.com>
References: <877gz31kbo.fsf@gnu.org>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:45249)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kjambunathan@gmail.com>) id 1S3VgS-0001Vr-4W
	for emacs-orgmode@gnu.org; Fri, 02 Mar 2012 11:50:25 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kjambunathan@gmail.com>) id 1S3VgP-0002AI-Jp
	for emacs-orgmode@gnu.org; Fri, 02 Mar 2012 11:50:19 -0500
Received: from mail-pw0-f41.google.com ([209.85.160.41]:46186)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kjambunathan@gmail.com>) id 1S3VgP-00029j-5I
	for emacs-orgmode@gnu.org; Fri, 02 Mar 2012 11:50:17 -0500
Received: by pbbro12 with SMTP id ro12so2438228pbb.0
	for <emacs-orgmode@gnu.org>; Fri, 02 Mar 2012 08:50:14 -0800 (PST)
In-Reply-To: <877gz31kbo.fsf@gnu.org> (Bastien's message of "Fri, 02 Mar 2012
	09:24:59 +0100")
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: Bastien <bzg@altern.org>
Cc: emacs-orgmode@gnu.org, Thorsten NaN <quintfall@googlemail.com>


"Git merge tool for Org files"

http://lists.gnu.org/archive/html/emacs-orgmode/2011-08/msg00601.html