Jakub Narebski [off-list ref] writes:
Junio C Hamano wrote:
quoted
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...
Well, sorry for wasting the bandwidth if it was not obvious from
my message, but that's exactly why I am announcing officially
that they *will* be removed with a definite timeframe.