"resolved" function doesn't delete temporary files.
By KJac... on March 09, 2009 06:50 (imported from Google Code)
What steps will reproduce the problem?
- Merge from some branch with conflicts.
- Click "Edit conflict" on the shell context menu.
- Merge it by hand and either click the resolved button in the
TortoiseMerge or on the shell context menu.
What is the expected output? What do you see instead?
The temporary files for merging should be deleted at this time like
TortoiseSVN, but they stayed there.
What version of the product are you using? On what operating system?
I'm using 0.4.2.0 and Vista64.
To upload designs, you'll need to enable LFS and have admin enable hashed storage. More information