Merge and Diff tools take a lot of time to open
Created originally on Bitbucket by Anonymous
When I go to file->settings and click on the drop down box to select merge tools or diff tools, the workbench goes to not responding state and the drop down box never opens. When I try to open merge tool while merging it takes a very very long time to open the merge tool.
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information