Johannes Schindelin wrote: > Jakub Narebski wrote: >> 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... > > Not exactly. The stages are in the index. For example, when you have > conflicts, the stages might not reflect _any_ tree at all! This is > because _part_ of the changes could be merged, and _part_ of the > changes conflict. > > But it does not matter anyway. Good bye diff-stages! Hmmm... I do wonder if git-diff-stages precedes introduction of combined diff format... -- 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