From: Jakub Narebski <jnareb@gmail.com>
Date: Wed, 07 Feb 2007 08:33:20 GMT
Subject: Re: Deprecation/Removal schedule
Message-ID: <200702070933.21804.jnareb@gmail.com>
In-Reply-To: <7vsldibfva.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano wrote:

> In 1.5.0, you will still see git-resolve and git-diff-stages,
> but they will be removed by 1.5.1.

Well, it is not as if we cannot obtain equivalent of git-diff-stages
without this command. Stages are <ours>, <theirs> and <ancestor>
(git-merge-base <ours> <theirs>) so I think we can use git-diff-tree
with appropriate arguments...

-- 
Jakub Narebski
Poland