Junio C Hamano <junkio@xxxxxxx> writes:
> Soon after 1.5.0 was released, I think we said these two were
> not used in practice and declared them as deprecated. So there
> is no "use this instead".
$ man git-resolve | grep -i 'use .* instead'
Reformatting git-resolve(1), please wait...
DEPRECATED and will be removed in 1.5.1. Use git-merge instead.
;-)
--
Matthieu
-
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