undo/redo implemented in diff/merge dialogs
"show inspector" icon in diff/merge dialogs
Merge branch 'mvtest30'
TemporaryModels rewritten