Martin von Zweigbergk 92bc6e4447 merged_tree: move MergeOptions to tree_merge ... `MergeOptions` isn't currently used directly in either module but it's more closely related to `tree_merge`. It's possible we will want to pass it into `ConflictIterator`, however.		2025-09-12 16:11:13 +00:00
..
examples	cli, lib: convert revset expressions to use Arc over Rc	2025-09-05 16:09:44 +00:00
src	merged_tree: move MergeOptions to tree_merge	2025-09-12 16:11:13 +00:00
testing	cli: add jj bisect run command	2025-09-04 14:30:52 +00:00
tests	files, tree: make same-change conflict resolution configurable	2025-09-11 13:14:28 +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	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00