From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 08 Sep 2009 18:43:38 GMT
Subject: Re: [PATCH] git.el: Use git-add-file for unmerged files, remove git-resolve-file
Message-ID: <873a6x9t0l.fsf@wine.dyndns.org>
In-Reply-To: <4AA026AC.10907@gmail.com>

Martin Nordholts <enselic@gmail.com> writes:

> Use `git-add-file' to mark unmerged files as resolved in the
> *git-status* buffer to be consistent with git's CLI instructions. Also
> remove `git-resolve-file' to make it clear that that "R" is a now a
> free keybinding.
>
> Signed-off-by: Martin Nordholts <martinn@src.gnome.org>

Looks good, thanks.

Acked-by: Alexandre Julliard <julliard@winehq.org>

-- 
Alexandre Julliard
julliard@winehq.org