forked from mirrors/jj
f39b0d24c8
Only tests dealing with Git submodules care about the backend type. Switching the tests to use the test backend also uncovered another bug in `MergedTree`, so I fixed that too. The bug only happens with legacy trees (path-level conflicts) and backends that care about the conflict path, so it wouldn't happen with Git backends, and it wouldn't happen at Google either (because we use tree-level conflicts). |
||
---|---|---|
.. | ||
src | ||
Cargo.toml |