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 - 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