title: Show conflict diff part of a merge
body: <p>I need to present to the team what changes I've made during conflict resolution of a merge.</p>
  
  <p>I know this is kind of hard, but I certainly believe it is possible somehow. I've tried already <code>git show -m</code> and <code>git show -c</code>.</p>