Robuta

https://codeberg.org/mergiraf/mergiraf mergiraf/mergiraf: A syntax-aware git merge driver for a growing collection of programming... mergiraf - A syntax-aware git merge driver for a growing collection of programming languages and file formats. syntax awaregit mergemergiraf https://zed.dev/blog/syntax-aware-editing Enabling low-latency, syntax-aware editing using Tree-sitter — Zed's Blog enabling lowsyntax awareusing