title: How to merge deleted/changed file in eGit
body: <p>The case: </p>
  
  <p>Locally, I have a commit where I have deleted a file. Remotely, someone else have changed this file.</p>
  
  <p>Now, when I merge, I find that git has the put the changed file in my working tree. This is probably the way git works, and in <code>git</code> command line, I'd be able to use <code>git mergetool</code> to choose between the deleted or changed file.</p>
  
  <p>In eGit, however, how would I make this choice?</p>
  
  <p>We ended up with a <em>quite unusable</em> work-around where we first addded the file to the index and then deleted it in working tree and then saved this change (deletion) to the index.</p>
  
  <p>Technical info:</p>
  
  <p>The version of eGit (feature) we're using is <code>4.9.2.201712150930-r</code>.</p>
  
  <p>The version of git we're using is <code>2.16.1</code></p>
  
  <p>Background:</p>
  
  <p>My team have recently moved to using Git as our revision control system. There's a general wish from team members to use an integrated solution and since we're working with Eclipse, eGit seemed to be the way to go.</p>