It's really annoying that SourceTree now switches to file status each time there is a refresh or slight change. I normally go through all the changes in a merge in the Log/History window, but each time, I close the external diff tool, sourcetree refreshes and switches to file status.