enhance: diff with merger option on local changes #3283

Job	Run time
Prepare version string	4s
Build / Build Windows ARM64	3m 40s
Build / Build macOS (Apple Silicon)	1m 52s
Build / Build macOS (Intel)	4m 10s
Build / Build Linux (arm64)	3m 7s
Build / Build Linux	3m 5s
Build / Build Windows x64	3m 29s
Package / Package macOS (osx-arm64)	15s
Package / Package macOS (osx-x64)	21s
Package / Package Windows (win-arm64)	25s
Package / Package Linux (linux-x64)	1m 3s
Package / Package Windows (win-x64)	17s
Package / Package Linux (linux-arm64)	48s
	22m 36s

Provide feedback