title: Git merge strategy 'theirs' is not resolving modify/delete conflict
body: <p>When performing a <code>git merge</code> with the following options:</p>
  
  <p><code>git merge -X theirs master</code></p>
  
  <p>There are occasionally conflicted files like so:</p>
  
  <blockquote>
    <p>CONFLICT (modify/delete): File_A.java deleted in master and modified
    in HEAD. Version HEAD of File_A.java left in tree.</p>
  </blockquote>
  
  <p>However, I would like for the <code>-X theirs</code> option to be recognized in these cases, and use the <code>theirs</code> version of the change, which is for the file to be <strong>deleted.</strong></p>
  
  <p>Is there a reason this type of conflict is not automatically resolved, <em>especially</em> since I'm providing a specific merge strategy that suggests it should remove the file?</p>
  
  <p>Further, how (if possible) can I update my <code>merge</code> command to use the <code>theirs</code> version of this type of conflict?</p>