Martin von Zweigbergk f7160cf936 merge: add absent() and normal() to Merge<Option<T>> ... These mimic the `RefTarget` functions. They're very useful in `MergedTree`. I might copy over other helpers from `RefTarget` later.		2023-08-09 21:58:15 +00:00
..
benches	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
gen-protos	cargo: unify a lot of crate metadata in the workspace	2023-08-06 16:44:33 -05:00
src	merge: add absent() and normal() to Merge<Option<T>>	2023-08-09 21:58:15 +00:00
tests	tests: test that git::import_refs() can update conflicted remote branch	2023-08-10 06:27:16 +09:00
testutils	tests: move commit_transactions() helper to testutils	2023-08-10 06:27:16 +09:00
Cargo.toml	cargo: unify a lot of crate metadata in the workspace	2023-08-06 16:44:33 -05:00