mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-15 16:53:25 +00:00
cc15ecf7c7
"Concurrent" operations are not necessarily actually concurrent, so "divergent" seems like a better name. And "reconcile" seems like a better term for merging them, though we also sometimes use "merge". |
||
---|---|---|
.. | ||
examples | ||
src | ||
testing | ||
tests | ||
build.rs | ||
Cargo.toml | ||
LICENSE |