title: How to use git mergetool's filemerge
body: <p>The documentation is here: <a href="http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html" rel="noreferrer">http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html</a>
  A handy guide is here: <a href="http://ryanflorence.com/git-for-beginners/" rel="noreferrer">http://ryanflorence.com/git-for-beginners/</a></p>
  
  <p>However, neither of them explain how to use mergetool's filemerge.</p>
  
  <p>The guide I read says "<em>I hit enter and FileMerge pops up and I deal with the conflicts:</em>" but it doesn't mention <strong><em>how</em></strong> to "<em>deal with the conflicts</em>".</p>
  
  <p>When I run:</p>
  
  <pre><code>git mergetool 
  </code></pre>
  
  <p>:and then hit return as prompted, and the filemerge window opens showing all the merge conflicts, it only responds to the commands cmd+D and cmd+shift+D (which allow cycling through the conflicts). However, there doesn't seem to be a mention of how to, for each conflict, choose left/right/neither. The combo-box dropdown does not seem to do anything.</p>
  
  <p>Have already looked at docs, guide, file system menu, and systematically pressed keys on the keyboard looking for a response =)</p>