title: Merge conflict error, when there was no change in mentioned file
body: <p>I have a site local repo and a remote repo.
  Local repo contains the 1-2 month old content of remote repo.</p>
  
  <p>I try to pull the whole content into local repo.</p>
  
  <pre><code>git pull origin master
  From ssh://.../site.git
   * branch            master     -&gt; FETCH_HEAD
  ...
  CONFLICT (add/add): Merge conflict in admin/process_email.php
  Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p>I checked process_email.php using P4Merge, but shows no conflict, furthermore there were no changes at all, no difference.</p>
  
  <p>UPDATE:</p>
  
  <p>I get </p>
  
  <pre><code>$ git status
  On branch master
  nothing to commit, working directory clean on both repos. 
  </code></pre>
  
  <p>Also I tried </p>
  
  <pre><code>$ git pull -X theirs origin/master master
  </code></pre>
  
  <p>But still get the same error.</p>
  
  <p>I want to merge the remote origin repo with my local repo.
  I want to overwite local repo with remote origin repo content as the remote repo is newer, contains the latest code.</p>
  
  <p>More than 2000 files are conflicting, while I checked the conflict and they have the same content. I would not want to do manual conflict handling. </p>
  
  <p>I have 
  autocrlf = False
  in the .gitconfig.</p>
  
  <p>Why do I get conflict error for files, which have exactly the same content?</p>