Martin Nordholts <enselic@xxxxxxxxx> 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@xxxxxxxxxxxxx> Looks good, thanks. Acked-by: Alexandre Julliard <julliard@xxxxxxxxxx> -- Alexandre Julliard julliard@xxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html