Re: [ANNOUNCE] GIT 1.5.1
From: Matthieu Moy <hidden>
Date: 2016-06-15 22:43:03
Junio C Hamano [off-list ref] 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