title: git get conflicts from past merge without running merge once again
body: <p>I've merged two branches. Got lot's of conflicts. Resolved them all. Now I'm not sure, maybe I've made an error during conflict resolution. And I don't see no another way to check is it  true — just run merge again, and check conflicts one by one.</p>
  
  <p>This means I need to create one more branch to store results of my merge, right?</p>
  
  <p>Can I avoid it? Maybe it's possible to get all conflicting files with all these <code>&lt;&lt;&lt;&lt;&lt;&lt;</code>, <code>======</code>, <code>&gt;&gt;&gt;&gt;&gt;&gt;</code> from somewhere in git, without running merge once again?</p>