title: How resolve multiple conflicts with "git mergetool" without having to close the editor between files?
body: <p>I've found <strong>git mergetool</strong> to be a handy utility for merging diffs visually, but the way I'm going about it seems really wonky.  Essentially, my process looks like this when conflicts are reported:</p>
  
  <ol>
  <li>Execute a <strong>git mergetool</strong></li>
  <li>At the prompt, hit <strong>Enter</strong> to launch my diff tool (Meld or FileMerge, depending on which computer)</li>
  <li>Resolve the conflicts</li>
  <li>Save the changes</li>
  <li>Close the diff tool</li>
  </ol>
  
  <p>If I have more than one conflict, rinse, repeat. Yep, that's me opening and closing my diff viewer once for each conflict in the merge. Since it's launched from the command line, closing it is the only way I know of to tell git mergetool that I've resolved this particular conflict and that it can move on to the next.</p>
  
  <p>Surely there's a better way, but I have no idea. Li'l help, please? This process seems crazy inefficient.</p>