title: IntelliJ Idea with Git: when automatic merge crashed, how can I continue to merge manually
body: <p>I use IntelliJ Idea with Git.
  When I pull from repository, I get following error:</p>
  
  <p>"
  ...CONFLICT (content): Merge conflict in server..."</p>
  
  <p>Then pull fails.</p>
  
  <p>Questions are:</p>
  
  <ol>
  <li>Does IntelliJ Idea displays any log of what happend exactly? How do I see it?</li>
  <li>How can I continue merge manually from the same point (where it failed)?</li>
  </ol>