It is currently not possible to see changes performed during a merge (esp by resolving merge conflicts) inside its commit, as git show HEAD does for a merge commit.
git diff [<options>] <commit> <commit>… <commit> [--] [<path>…]
This form is to view the results of a merge commit. The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents. Convenient ways to produce the desired set of revisions are to use the suffixes ^@ and ^!. If A is a merge commit, then git diff A A^@, git diff A^! and git show A all give the same combined diff.
Problem description
It is currently not possible to see changes performed during a merge (esp by resolving merge conflicts) inside its commit, as
git show HEADdoes for a merge commit.Preferred solution
Add support for: https://git-scm.com/docs/git-diff#Documentation/git-diff.txt-emgitdiffemltoptionsgtltcommitgtltcommitgt82308203ltcommitgt--ltpathgt82308203