title: undoing git merge after merge.renameLimit warning plus conflicts
body: <p>I am trying to do a merge squash from a devel branch into the master.</p>
  
  <pre><code>stefanos-imac:trunk borini$ git merge --squash devel
  CONFLICT (content): Merge conflict in test1
  warning: inexact rename detection was skipped due to too many files.
  warning: you may want to set your merge.renamelimit variable to at least 2224 and retry the command.
  Squash commit -- not updating HEAD
  Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p>fair enough.</p>
  
  <pre><code>stefanos-imac:trunk borini$ git config merge.renameLimit 999999
  </code></pre>
  
  <p>Then I try to undo the merge and redo it with the higher limit</p>
  
  <pre><code>stefanos-imac:trunk borini$ git merge --abort
  fatal: There is no merge to abort (MERGE_HEAD missing).
  </code></pre>
  
  <p>Ok, so maybe I have to do as it says and just reinvoke the merge command</p>
  
  <pre><code>stefanos-imac:trunk borini$ git merge --squash devel
  fatal: 'merge' 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>oh git, why are you such a git?</p>
  
  <p>More to the point, does anyone know how to get out of this situation ? </p>