It would be nice to be able to move around the diff view and merge conflict resolve view by pressing the middle mouse button, similar to an image viewer. The scroll bars are really small and I keep getting annoyed with them.
This is also related to Shift-Scroll to increase/decrease code font size