Yuya Nishihara 9589bec37a files: add option to resolve conflicts word by word ... This option affects emptiness of commits, which means indexed changed files can become stale on configuration change. This problem can also be said for changes in the diff algorithms, so I don't think we need a logic to invalidate index on config change. I have this patch for months, and it seems working good at least for Rust sources. Closes #17		2025-09-09 03:44:16 +00:00
..
examples	cli, lib: convert revset expressions to use Arc over Rc	2025-09-05 16:09:44 +00:00
src	files: add option to resolve conflicts word by word	2025-09-09 03:44:16 +00:00
testing	cli: add jj bisect run command	2025-09-04 14:30:52 +00:00
tests	files: add option to resolve conflicts word by word	2025-09-09 03:44:16 +00:00
build.rs	build.rs: separate commit ids if compiling at a merge commit	2025-07-08 02:38:21 +00:00
Cargo.toml	cli: add jj bisect run command	2025-09-04 14:30:52 +00:00
docs
LICENSE