title: Why does git generate conflicts during a merge that are auto-resolved by most merge tools such as kdiff3?
body: <p>As stated in the title.  I tried googling this but found no explanation for it so I looked at the kdiff3 documentation which provided some insight.  The situation i'm running into is I do a merge from one branch into another, get a bunch of conflicts and use git mergetool to resolve them one by one.  What happens is that for some files when kdiff3 is started, it pops up a dialog that there were x auto resolved conflicts and that there are no conflicts left so i save the file and continue.</p>
  
  <p>According to kdiff3 documentation, conflicts are auto resolved if the line was changed in only one version of the file.  Ie. the base is the same as the local or remote file, but not both.</p>
  
  <p>My question is, if my merge tool can auto-resolve this(i've tried a few and they all auto resolve some conflicts) and indeed it seems logical what it does, why do I even get a conflict from git?</p>
  
  <p>A follow up question is: how can I make git auto-resolve these conflicts before i even pop open my merge tool?</p>
  
  <p>An example would be:</p>
  
  <pre><code>base:
  line 1
  line 2
  line 3
  
  local:
  line 1
  line 2
  line 3
  
  remote:
  line 1
  line abc
  line 3
  </code></pre>
  
  <p>I think the above conflicts in Git but is auto resolved in kdiff3.  Though it might be a different case, i've done merges that were auto-resolved before, can't remember the exact scenario since it auto-resolved.</p>