2 ms·I'd settle for AST-aware merge. That also fixes comments not glued to code they were attached to beforeby ilyt 4y agoI'd settle for AST-aware merge. That also fixes comments not glued to code they were attached to before