Martin von Zweigbergk a995c66635 merge: move some methods back to conflicts as free functions ...

I think I moved way too many functions onto `Merge<Option<TreeValue>>`
in 82883e648da4. This effectively reverts almost all of that
commit. The `Merge<T>` type is simple container and it seems like it
should be at fairly low level in the dependency graph. By moving
functions off of it, we can get rid of the back-depdencies from the
`merge` module to the `conflict` module that I introduced when I moved
`Merge` to the `merge` module. I'm thinking the `conflict` module can
focus on materialized conflicts.

2023-08-11 21:11:25 +00:00

..

examples

cargo: move examples/ into cli/ so they are part of the build again

2023-08-07 21:49:45 +00:00

src

merge: move some methods back to conflicts as free functions

2023-08-11 21:11:25 +00:00

testing

cli: move src/ directory to new cli/ directory

2023-08-04 19:00:42 -05:00

tests

Update docs and errors to use XDG config path

2023-08-11 13:21:44 -07: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