Martin von Zweigbergk 65a988e3d2 merged_tree: make tree builder attempt to resolve conflicts ... As we discovered in the `jj fix` tests, `MergedTreeBuilder::write_tree()` doesn't try to resolve conflicts, not even trivial ones. This patch fixes that.		2024-06-08 20:29:30 +09:00
..
examples	revset: replace ParseState with &RevsetParseContext	2024-06-05 10:39:32 +09:00
src	diff_util: don't panic for file hashes < 10 hex chars	2024-06-06 11:50:59 -04:00
testing	cli: add a fake code formatter tool for testing	2024-06-04 14:28:21 -05:00
tests	merged_tree: make tree builder attempt to resolve conflicts	2024-06-08 20:29:30 +09:00
build.rs
Cargo.toml	cli: implement enough of jj fix to run a single tool on all files	2024-06-04 14:28:21 -05:00
LICENSE