Merge driver for the sorted per-feature registries (dragon-sorted)

.gitattributes

@@ -19,6 +19,7 @@ packages/layout/vectors/dpr-*/** merge=dragon-generated
 packages/parity/emitted/** merge=dragon-generated
 packages/parity/expected-breaks/** merge=dragon-generated
 packages/parity/expected-dpr/** merge=dragon-generated
+packages/parity/expected-env/** merge=dragon-generated
 packages/parity/expected-fonts/** merge=dragon-generated
 packages/parity/expected-frames/** merge=dragon-generated
 packages/parity/expected-glyphs/bottom-scanlines.json merge=dragon-generated
@@ -37,3 +38,11 @@ packages/wpt/snapshots/** merge=dragon-generated
 # extended lists, so two PRs that both raise a floor do not conflict; anything else it leaves as a conflict. Needs `pnpm setup:git`.
 packages/*/test/*-floor.json merge=dragon-floor
 packages/*/test/glyph-clearance-pins.json merge=dragon-floor
+
+# The sorted per-feature registries (one line per feature): a merge (scripts/sorted-merge.ts) interleaves two PRs' added lines by
+# the key their test sorts by; a deletion, a modification or anything else stays a conflict. Needs `pnpm setup:git`.
+packages/dragon/src/css/animation-kinds.ts merge=dragon-sorted
+packages/dragon/src/diagnostics/codes.ts merge=dragon-sorted
+packages/dragon/src/faults.ts merge=dragon-sorted
+packages/parity/src/fixtures.ts merge=dragon-sorted
+scripts/regen.ts merge=dragon-sorted