4 commits

Author	SHA1	Message	Date
Yuya Nishihara	58acc1d111	tests: replace jj_cmd_success() involving mutation to allow stderr output	2023-10-11 19:24:01 +09:00
Yuya Nishihara	e3c85d6ecc	revset: convert root symbol to function ... The idea is that we can fully eliminate special symbols that would otherwise shadow user branches, tags, or change ID prefixes. Closes #2095	2023-09-04 10:36:30 +09:00
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)