title: Cannot git merge --abort until git status
body: <p>First I merge sth, then conflicts occurs, so I <code>git merge --abort</code>, but failed, I have to do <code>git status</code> first, then <code>git merge --abort</code> succeeded.</p>
  
  <pre><code>$ git merge features/test
  Auto-merging src/cmd.c
  CONFLICT (content): Merge conflict in src/main.c
  Auto-merging src/client.c
  Automatic merge failed; fix conflicts and then commit the result.
  $ git merge --abort
  error: Entry 'src/option.h' not uptodate. Cannot merge.
  fatal: Could not reset index file to revision 'HEAD'.
  $ git merge --abort
  error: Entry 'src/option.h' not uptodate. Cannot merge.
  fatal: Could not reset index file to revision 'HEAD'.
  $ git status 
  # On branch te
  # You have unmerged paths.
  #   (fix conflicts and run "git commit")
  #
  # Changes to be committed:
  #
  **********
  #
  # Unmerged paths:
  #   (use "git add &lt;file&gt;..." to mark resolution)
  #
  **********
  #
  $ git merge --abort
  $ git status
  # On branch te
  nothing to commit, working directory clean
  </code></pre>
  
  <p>Is anything I'm doing wrong?</p>
  
  <p><strong>git version 1.8.3.1</strong></p>