title: Git conflict "both deleted"
body: <p>I don't understand why "both deleted" is a status for unmerged paths.</p>
  
  <p>If:</p>
  
  <ul>
  <li>OldStandard is the base</li>
  <li>NewStandard is the last commit on the trunk</li>
  <li>OldCustom is the branch (fork from OldStandard) we try to merge back in master</li>
  </ul>
  
  <p>Why is there a conflict with some files marked as "both deleted"?</p>
  
  <p>I understand the conflict for "both added", when one file is added in NewStandard, and another version of the file is added in OldCustom.</p>
  
  <p>But, for deletion, what's the problem if the file has been deleted in NewStandard, and has also been deleted in OldCustom?  That's an equivalent state, nope?</p>