title: Abort conflicting merge in egit
body: <p>I recently did a misclick in the repositories view and merged two commits that can't (and shouldn't) be merged. The result was a merge conflict.</p>
  
  <p>Native git has <code>git merge --abort</code> for such cases.</p>
  
  <p>However, i cant find such an option in egit.</p>