mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-29 23:57:51 +00:00
1c3fe9a651
`MergedTree` is now ready to be used when checking if a commit has conflicts, and when listing conflicts. We don't yet a way for the user to say they want to use tree-level conflicts even for these cases. However, since the backend can decide, we should be able to have our backend return tree-level conflicts. All writes will still use path-level conflicts, so the experimentation we can do at Google is limited. Beacause `MergedTree` doesn't yet have a way of walking conflicts while restricting it by a matcher, this will make `jj resolve` a little slower. I suspect no one will notice. |
||
|---|---|---|
| .. | ||
| benches | ||
| gen-protos | ||
| src | ||
| tests | ||
| testutils | ||
| Cargo.toml | ||