Martin von Zweigbergk ecc030848d conflicts: rename Conflict<T> to Merge<T> ... Since `Conflict<T>` can also represent a non-conflict state (a single term), `Merge<T>` seems like better name. Thanks to @ilyagr for the suggestion in https://github.com/martinvonz/jj/pull/1774#discussion_r1257547709 Sorry about the churn. It would have been better if I thought of this name before I introduced `Conflict<T>`.		2023-08-06 22:08:09 +00:00
..
src	conflicts: rename Conflict<T> to Merge<T>	2023-08-06 22:08:09 +00:00
testing	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
tests	tests: move tests/ under cli/ so they're run again	2023-08-05 06:18:59 +00:00
build.rs	build: update rerun-if conditions to watch .git/HEAD in colocated repo	2023-08-06 12:16:11 +09:00
Cargo.toml	cargo: unify a lot of crate metadata in the workspace	2023-08-06 16:44:33 -05:00