Cancelled squash merge does not allow to abort merge
What steps will reproduce the problem?
- Init a merge which will lead to conflicts and use "squash" option
- Open commit dialog to resolve conflicts
- Cancel commit dialog
What is the expected output? What do you see instead?
I would expect the "Git Abort Merge" context menu entry insetad of the "Git Merge" entry, because the repo is in a "pending merge state" and another merge can not be started.
For convenience an "Abort" button could be shown on the commit dialog if a merge is pending.
What version of TortoiseGit and Git are you using? On what operating system?
TGit 2.4.0.2, Git 2.10.2, Win 7