Save/restore proportion between editor and inspector in diff/merge model dialog
Fix NPE
Do not show 2 toolbars for one-root-only diff
Do not close diff/merge panel when no root is selected
Option to not show inspector in diff/merge panel
Merge branch 'mvtest30'