title: How can I see diffs of all of the conflicts in a mercurial (or git) merge?
body: <p><a href="https://stackoverflow.com/questions/4832006/mercurial-see-list-of-files-that-need-to-be-manually-merged/38471357">This question</a> asks how to see which files have conflicts in a merge.  I'd also like to be able to quickly see listings of the diffs for all of the conflicts (as opposed to the diffs in the merge that went through cleanly.)</p>
  
  <p>For instance, this would make it possible to quickly dispense with some conflicts that are just "noise" by resolving those with <code>--tool :other</code> <code>--tool :local</code> or <code>--tool :union</code> without bringing up a merge editor.</p>
  
  <p>I think answers (I'm formulating one right now) will be analogous with small differences for git and mercurial, so I'll risk leaving the question vc-agnostic.</p>