From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 08 Sep 2009 20:43:34 GMT
Subject: Re: [PATCH] git.el: Use git-add-file for unmerged files, remove git-resolve-file
Message-ID: <7vhbvdxj49.fsf@alter.siamese.dyndns.org>
In-Reply-To: <873a6x9t0l.fsf@wine.dyndns.org>

Alexandre Julliard <julliard@winehq.org> writes:

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

Thanks, both.