This is related to this question about why the pull option in the TortoiseGit menu is missing - a (conflicting?) merge is in process, so pull is hidden from the context menu. But when I try both Resolve... and Revert... in the menu, there are no files there, so there's no way to fix it. Tried both Clean up and hard resetting the branch, but to no avail. And there's no Abort merge option either.
Pull is available if you show log and right click on an entry, so there's a workaround, but it would be nice to restore it to the menu. Using version 2.15.0.0.
Edit: Have tried command line, but there simply is no merge going on according to Git, so it doesn't do anything:
> git merge --abort
fatal: There is no merge to abort (MERGE_HEAD missing)
It seems as if have adjusted the context menu settings: https://tortoisegit.org/docs/tortoisegit/tgit-dug-settings.html#tgit-dug-settings-look-feel-extended