Say I have,
A topic
/ \
D---E---F master
I can easily get the diff of D-E by doing
git diff D..E --name-status
and same for E-F, and E-A.
Commit F is a merge commit, and say it had a conflict. It was resolved by modifying foo.bar. foo.bar was git added, then the merge commit was committed. The merge conflict was resolved.
Now the change for foo.bar exists only in commit F. How do I get that diff?
Is there a way to get the diff of files that were uniquely introduced in a merge commit?