Merge popup internal view doesn't resize properly

[Mark Boyle]

The view for the code tree and file list is always a fixed height and doesn't resize with the window 

(Mac) (v 2.5.2) 

[Mark Boyle]

Added a Jira ticket. https://jira.atlassian.com/browse/SRCTREE-4801