Tarik Billa
Try git merge --abort. Handy, eh?
git merge --abort
Comment
Save my name, email, and website in this browser for the next time I comment.