Fix some conflicts with global/file history
Merge upstream/master
Pre-select file in CommitDiff dialog