title: git merge ignores deleted files, existing on merged branch (renamed files)
body: <p>I've got the branches <code>feature1</code> and <code>master</code>.<br>
  Then in <code>feature1</code> I renamed a file <code>dir/file.txt</code> into <code>dir2/file2.txt</code>.<br>
  After that I altered the file in <code>master</code> and a week later altered the file in <code>feature1</code> too.  </p>
  
  <p>I have 40 files changed like that across the project.<br>
  When I try to merge <strong><code>master</code> into <code>feature1</code></strong> I'm using low renaming threshold.
  Most of the files are auto-merged correctly. Some files are offered for manual conflict resolution.</p>
  
  <p>But some concrete files <strong>neither appear in the <code>merge</code> response as auto-merged,<br>
  nor getting merged properly</strong>. Under <em>properly</em> I expect one of two outcomes I could resolve:<br>
  1. It wouldnt detect renaming and just add me another <code>dir/file.txt</code> into the <code>feature1</code> branch.<br>
  2. It would detect renaming and offer me to manually resolve conflict.</p>
  
  <p>There are many changes when I view them with<br>
  <code>git difftool master:dir/file.txt feature1:dir2/file2.txt</code></p>
  
  <p>Therefore I assume that git recognizes the renaming and decides to keep my version
  without informing me about what's going on.
  How can I solve it / debug it ?</p>
  
  <p><strong>This is the command I use</strong></p>
  
  <pre><code>git config merge.renameLimit 9999999999
  git merge --no-ff -Xrename-threshold=20 -Xignore-space-change master
  </code></pre>
  
  <h1>Upd1</h1>
  
  <p>While working with <code>feature1</code> branch, I had deleted <code>dir/file.txt</code>.<br>
  Maybe git assumes this file should be deleted and therefore ignores it's existence in <code>master</code>.<br>
  Renaming detection fails, although the similarity of the files is kept ( levenshtein distance is less than 2% of the content's length )<br>
  <a href="https://stackoverflow.com/questions/1407638/git-merge-removing-files-i-want-to-keep">Another discussion</a> suggests 'manual merge' copying files from branch to branch.</p>
  
  <h1>Upd2</h1>
  
  <p>Some other files are resolved correctly<br>
  <code>CONFLICT (rename/delete): images/ab.gif deleted in master and renamed in HEAD. Version HEAD of cdn/img/ab.gif left in tree.</code><br>
  Files that were removed in <code>master</code> and merged into <code>feature1</code> are resolved correctly. Files that are deleted (or moved) in <code>feature1</code>  ain't recognized at the merge.<br>
  <strong>Sugestions?</strong></p>
  
  <h1>Upd3</h1>
  
  <p>At the moment I'm trying to merge the other way around. Merge <code>feature1</code> into <code>master</code> and see what files 
  are being added and removed. This way I'll a list of files git fail's to recognize as renames and resort to manual merging.</p>