Martin von Zweigbergk 732e448458 diff_util: use MergedTree throughout ... This switches the whole `diff_util` module to working with `MergedTree`, `Merge<Option<TreeValue>>` etc., so it can support tree-level conflicts. Since we want to avoid using `ConflictId`s, I switched the hash we use for conflicts in `--git` style diffs to use an all-'0' id instead of using the conflict id.		2023-08-27 07:50:28 -07:00
..
examples	cargo: move examples/ into cli/ so they are part of the build again	2023-08-07 21:49:45 +00:00
src	diff_util: use MergedTree throughout	2023-08-27 07:50:28 -07:00
testing	fake_diff_editor: Allow specifying extra arguments to be ignored	2023-08-21 20:19:15 -07:00
tests	diff_util: use MergedTree throughout	2023-08-27 07:50:28 -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	Use { workspace = true } to appease VS Code's Cargo.toml parser	2023-08-22 21:38:53 -07:00