Git merge abort. Tortoisegit. git merge squash. fast forward merge.