title: Git marking identical "both added" files as a conflict during a merge
body: <p>I'm trying to merge a branch from a remote repo into ours (this is done periodically). However, I've ran into problems.</p>
  <p>What I got is over 3000 conflicts (which is absurd, we edited less than 100 files since the last merge), most of them being &quot;both added&quot;, but completely identical. Why can't git resolve this automatically? I've run tortoisemerge as merge tool and I have to manually mark each of the files as resolved, one by one. I've checked, the files in conflict have the same hash.</p>
  <p>There are also several files where the conflit is in EoL symbol, which shouldn't be happening since I <code>merge.renormalize</code> has been set to <code>true</code>. I've also tried using both</p>
  <pre><code>git merge -s recursive -Xignore-space-at-eol
  </code></pre>
  <p>and</p>
  <pre><code>git merge master -s recursive -X renormalize
  </code></pre>
  <p>But with the same result, conflicts when EoL doesn't match.</p>
  <p>Any ideas as to what might be wrong here?</p>
  <p>EDIT: It seems that it is a permission conflict, the execute bit to be exact. However, I've set <code>core.fileMode</code> to <code>false</code>, so it shouldn't mark them as different.</p>