title: Is there a git-merge --dry-run option?
body: <p>I'm merging in a remote branch that may have a lot of conflicts.  How can I tell if it will have conflicts or not?</p>
  
  <p>I don't see anything like a <code>--dry-run</code> on <code>git-merge</code>.  </p>