title: Git: how to mark a file as conflicted after "git merge-file"?
body: <p>I've been using "git merge-file" to help me port code from a different repository. This works great.</p>
  
  <p>However, when a merge conflict happens, though "git merge-file" will properly report it, the file isn't marked as needing resolution in "git status". In the status, the file is just seen as modified (understandably, since the merge happened outside of git's usual flow).</p>
  
  <p>This is a problem because sometimes when importing a large number of files, I'll miss the message highlighting the conflict.</p>
  
  <p>Is there a way to manually tell git that the file needs resolution?</p>
  
  <p>I tried "git update-index --unmerged somefile", but that didn't appear to work: the file isn't listed as conflicted.</p>