ux: re-design built-in merge conflict editor #5111

Job	Run time
Build / Build Windows x64	4m 6s
Build / Build Windows ARM64	3m 45s
Build / Build macOS (Apple Silicon)	3m 24s
Build / Build Linux	3m 10s
Build / Build macOS (Intel)	3m 52s
Build / Build Linux (arm64)	3m 22s
Prepare version string	5s
Package / Package Linux (linux-x64)	58s
Package / Package Windows (win-x64)	23s
Package / Package Linux (linux-arm64)	54s
Package / Package macOS (osx-arm64)	15s
Package / Package macOS (osx-x64)	21s
Package / Package Windows (win-arm64)	26s
	25m 1s

Navigation Menu