Initial support for top-level edges in diff panel
Merge branch 'master' into 466-diffpanel-edges
Fix undo with edges
Fix diff panel error messages