Fix black arrors on left pane in diff/merge dialogs
Merge branch 'mvtest30'
make