mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-29 23:57:51 +00:00
2bbaa4352a
Copied from MergedTree::has_conflict(). I feel it's slightly better since RefTarget "is" always a Conflict-based type. It could be inverted to RefTarget::is_resolved(), but refs are usually resolved, and all callers have special case for !is_resolved() state. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
src | ||
tests | ||
testutils | ||
Cargo.toml |