Martin Nordholts aaa68dd50f 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>

2009-09-09 12:11:44 -07:00

68 KiB

Raw Blame History

View Raw