"Abort merge" does not clean up .BASE .LOCAL .REMOTE files created for diffing
What steps will reproduce the problem?
- Create two branches with a file triggering a conflict if merged
- merge the branches
- on the merge conflict dialogue click "resolve"
- On the list of conflicting files right click on the file then click on "Edit conflicts"
- Close the software that has opened in compare view (say MS Word if the file is a .docx file)
- On the context menu select "Abort merge"
- On the Abort merge dialogue check "Hard (discard all local changes)", then click OK
What is the expected output? What do you see instead?
I would expect that TortoiseGit deleted the three files, say, filename.LOCAL.docx, filename.REMOTE.docx and filename.BASE.docx files created by TortoiseGit for diffing. Instead the files remain in the working tree.
Pls. notice that when the "edit conflicts" action is not aborted and I click "Resolved" on the context menu, the three files are removed correctly.
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)
Please provide any additional information below.