From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Fri, 06 Apr 2007 07:24:43 GMT
Subject: Re: [ANNOUNCE] GIT 1.5.1
Message-ID: <vpq8xd6ge2s.fsf@bauges.imag.fr>
In-Reply-To: <7vlkh6kqk6.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> 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