Yuya Nishihara 0376bcfdc6 files: rename FileMergeOptions to MergeOptions, move to merged_tree ... I'll add same-change rule parameter to disable A+(A-B)=A resolution. Since tree merging involves content merging, file-level parameters should also be included in the "tree" merge options. We could add a nested options type, but I don't think we'll add an option that applies only to tree-level merging. So this patch unifies these options types as MergeOptions.		2025-09-11 13:14:28 +00:00
..
examples	cli, lib: convert revset expressions to use Arc over Rc	2025-09-05 16:09:44 +00:00
src	files: rename FileMergeOptions to MergeOptions, move to merged_tree	2025-09-11 13:14:28 +00:00
testing	cli: add jj bisect run command	2025-09-04 14:30:52 +00:00
tests	cli metaedit: fix --update-author if author was unset	2025-09-11 13:03:43 +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