I need to present to the team what changes I've made during conflict resolution of a merge.
I know this is kind of hard, but I certainly believe it is possible somehow. I've tried already git show -m and git show -c.
Answer 1:
看看合并的哈希（或标签）提交（提交具有多个家长），并做到：
git diff hash hash^1 hash^2
它将输出的变化的3路-DIFF。
hash^ （或hash^1 ）引用了第一个父提交的hash
hash^2所述第二个亲本的引用提交的hash
Answer 2:
如果您使用标准gitk工具，然后单击合并提交，下左窗格中显示了冲突的决议。
文章来源: Show conflict diff part of a merge
