title: git checkout --ours does not remove files from unmerged files list
body: <p>Hi I need to merge two branches like this.</p>
  
  <p>This is just an example what is happening, I work with hundreds of files which need resolution.</p>
  
  <pre><code>git merge branch1
  ...conflicts...
  git status
  ....
  # Unmerged paths:
  #   (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution)
  #
  #   both added:   file1
  #   both added:   file2
  #   both added:   file3
  #   both added:   file4
  git checkout --ours file1
  git chechout --theirs file2
  git checkout --ours file3
  git chechout --theirs file4
  git commit -a -m "this should work"
  U   file1
  fatal: 'commit' is not possible because you have unmerged files.
  Please, fix them up in the work tree, and then use 'git add/rm &lt;file&gt;' as
  appropriate to mark resolution and make a commit, or use 'git commit -a'.
  </code></pre>
  
  <p>When I do <code>git merge tool</code>, there is the correct content just from the 'ours' branch and when I save it, the file disappears from the unmerged list. But since I have hundreds of files like this, this is not an option.</p>
  
  <p>I thought that this approach will bring me where I want to be - easily say which file from which branch I want to keep.</p>
  
  <p>But I guess I misunderstood the concept of the <code>git checkout --ours/theirs</code> commands after a merge.</p>
  
  <p>Could you please provide me some info, how to handle this situation? I use <code>git 1.7.1</code></p>