> What I'd love to see with "git log -p" is the diff between a trivial > merge (possibly including conflict markers) and the actual merge commit. > That would imply that "git log" would redo the merge before computing > the diff (rather heavyweight :-( ), but an empty diff would mean "no > change other than merge", and if any, we would see the conflict > resolution or additional changes in the diff.
This would be wonderful. And I'd rather have git do the heavyweight work than doing it myself :-/ I don't know the git internals at all - would it be possible to "save" the results of the diff? This is what I was aiming for in my idea of making the merge and conflict-resolution as separate commits. > -- > Matthieu Moy > http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
