2 commits

Author	SHA1	Message	Date
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
Martin von Zweigbergk	0075174308	tests: move tests/ under cli/ so they're run again ... Thanks to @ilyagr for noticing that they should be moved.	2023-08-05 06:18:59 +00:00

Renamed from tests/test_interdiff_command.rs (Browse further)