From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Fri, 17 Feb 2006 12:24:55 GMT
Subject: Re: contrib/ area
Message-ID: <46a038f90602170424u59f84ac8l1311d80cd7251394@mail.gmail.com>
In-Reply-To: <873biikx6k.fsf@wine.dyndns.org>

On 2/18/06, Alexandre Julliard <julliard@winehq.org> wrote:
> Is there interest in an emacs interface for git?  I posted a first
> version (http://marc.theaimsgroup.com/?l=git&m=113313040724346&w=2)
> some time ago, I'd be happy to send you a patch with my latest version
> if you want to include it.

Yes, please. I'd really like to see it help handle conflicts, and
provide multi-pane views during merges. We are in love with emacs diff
mode for conflict resolution when you end up with .rej files, but it
doesn't kick in properly with the inline conflict markers :-(

cheers,


m