mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-12 23:23:20 +00:00
8e6e04b929
It's been about six months since we started using tree-level conflicts by default. I can't imagine we would switch back. So let's continue the migration by always using tree-level conflicts when merging trees, even if all inputs were legacy trees. |
||
---|---|---|
.. | ||
examples | ||
src | ||
testing | ||
tests | ||
build.rs | ||
Cargo.toml | ||
LICENSE |