Martin von Zweigbergk ef5f97f8d7 conflicts: move Merge<T> to merge module ... The `merge` module now seems like the obvious place for this type.		2023-08-06 22:08:09 +00:00
..
src	conflicts: move Merge<T> to merge module	2023-08-06 22:08:09 +00:00
testing
tests
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