"Abort" button in merge conflict dialogue is misleading
What steps will reproduce the problem?
- Create two branches that diverge with at least one conflict if merged
- Merge the branches
- When the conflict is raised the dialogue has both a "cancel" button and an "abort" button
- Click on the abort button
What is the expected output? What do you see instead?
Clicking "abort" I expect that the merge abort process starts as it does when clicking on the context menu "Abort merge" command. In that case (after clicking the item) a dialogue is shown where it is possible to chose among different types of reset.
Alternatively, the "abort" button should not be shown, because as things stand now it is a duplicate of the "cancel" button and it is confusing, leading people to believe that something else should happen or worst, that they have already aborted the merge process.
What version of TortoiseGit and Git are you using? On what operating system?
- TortoiseGit 2.5.0.0 (C:\Program Files\TortoiseGit\bin)
- git version 2.10.0.windows.1 (C:\Program Files\Git\bin; C:\Program Files\Git\mingw64; C:\Program Files\Git\mingw64\etc\gitconfig; C:\ProgramData\Git\config)
Edited by Sven Strickroth