mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-15 16:53:25 +00:00
8e54e3e70e
I also removed "now" from "is now a normal file" because conflicts should be materialized as a normal file. "is a normal file" is tested by caller. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
proc-macros | ||
src | ||
tests | ||
testutils | ||
Cargo.toml | ||
LICENSE |