feat: resolve current jj working-copy conflicts

Add a dedicated native resolver workspace with all side/base inputs,
shared editable Results, region choices, retained per-file status,
responsive rendering, and explicit nontext file choices.

Guard writes with jj working-copy locking, frozen checkout identity,
exact disk baselines, native dirty-buffer protection, and asynchronous
jj snapshot/status confirmation. Historical comparisons remain readonly.

Verified all 916 tests and live isolated terminal workflows covering text
regions, narrow layouts, binary bytes and symlink targets/types.
Clippy completes with pre-existing warnings only.

Size exception: 2614 implementation additions/deletions excluding tests
and docs. Native workspace integration, explicit file choices and the
safe save/check operation are retained as one complete behavioral slice.

This commit is contained in:

Valdemar Lorenzen

2026-10-14 15:49:26 +02:00

parent dcfa50319c

commit a3aef713e2

13 changed files with 3591 additions and 20 deletions

									
										src/lib.rs
									
		+1
		
												View File
												
				@@ -13,6 +13,7 @@ mod markdown;

				pub mod panes;

				pub mod plugin;

				pub mod repository;

				pub mod resolve;

				pub mod ruby;

				pub mod session;

				mod snippet;