title: Git Stash Pop - Resolve Conflicts with mergetool
body: <p>So,</p>
  
  <p>I've come across this suddenly, as it, in epic blundering form, rendered my application useless, but git stash pop (or apply) automatically handles the merge conflicts.  When it does this, it adds both versions to the file like so:</p>
  
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; Updated [remote]
       Change from Remote
  =======
       Change from Stash
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; Stashed changes
  </code></pre>
  
  <p>Not knowing this at first cost me some time, as those added lines invalidated the xml file.</p>
  
  <p>So, i am wondering if there is a way to enforce git stash to not auto-merge but to leave the conflicts in place so they can be resolved with the git mergetool, instead of requiring me to open each file in the editor and handle the "merte" process without the benefit of the tool designed for merge conflicts.</p>
  
  <p>Thanks
  Jaeden "Sifo Dyas" al'Raec Ruiner</p>