Yuya Nishihara 4dee8e46ce conflicts: compare new hunks without fully materializing original to text ... It seemed odd that we had to pass ConflictMarkerStyle to snapshot functions. Suppose materialize/parse functions aren't lossy, we can compare hunks in Vec<Merge<BString>> form. This should also be robust for configuration changes. test_materialize_parse_roundtrip_different_markers() is simplified as there should no longer be "pair" of marker styles.		2025-09-05 00:39:41 +00:00
..
examples	backend: remove unused TreeValue::Conflict and read/write methods	2025-09-04 16:26:44 +00:00
src	conflicts: compare new hunks without fully materializing original to text	2025-09-05 00:39:41 +00:00
testing	cli: add jj bisect run command	2025-09-04 14:30:52 +00:00
tests	cli: help: look up subcommand without using error path	2025-09-05 00:26:12 +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	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
LICENSE