mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-01 00:50:57 +00:00
88018e84fc
try_resolve_file_conflict() is also updated. It could be a generic function, but there are only two callers, and the legacy tree one is used only in tests. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
proc-macros | ||
src | ||
tests | ||
testutils | ||
Cargo.toml | ||
LICENSE |