From: Martin Nordholts <enselic@gmail.com>
Date: Thu, 3 Sep 2009 20:27:24 +0000 (+0200)
Subject: git.el: Use git-add-file for unmerged files, remove git-resolve-file
X-Git-Tag: v1.6.5-rc1~24
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/aaa68dd50f7b4226fdfdfbbe8bbb2dfd9a9e6d66?hp=aaa68dd50f7b4226fdfdfbbe8bbb2dfd9a9e6d66

git.el: Use git-add-file for unmerged files, remove git-resolve-file

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>
Acked-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---