forked from mirrors/jj
de71df2447
This simplifies a bit, in particular by removing the error case from `extract_file_conflict_as_single_hunk()`. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
src | ||
tests | ||
testutils | ||
build.rs | ||
Cargo.toml |