Martin von Zweigbergk 1ec906b114 files: make merge() require one more adds than removes ... All call paths already check before calling the function that the condition is true. One caller - `tree::try_resolve_file_conflict()` - checks it itself. The other caller - `conflicts::materialize_merge_result()` - doesn't, but its callers have checked it via `extract_file_conflict_as_single_hunk()`. The deleted comment about empty strings seems to be obsolete since e48ace56d1. The caller pads the inputs with empty strings since that commit. I think we should ideally change this function's signature to make it impossible to call it with bad inputs, and I hope to get back to that soon.		2023-05-24 22:00:38 -07:00
..
benches	benches: group unchanged/modified/reversed-line diffs together	2023-03-27 23:38:56 +09:00
gen-protos	cargo: bump prost-build from 0.11.8 to 0.11.9	2023-04-14 16:11:09 +00:00
src	files: make merge() require one more adds than removes	2023-05-24 22:00:38 -07:00
tests	tests: invoke .walk_revs() through CompositeIndex	2023-05-24 01:02:37 +09:00
testutils	cargo: bump git2 from 0.17.0 to 0.17.1	2023-04-17 09:19:58 -07:00
build.rs	lib: replace protobuf crate with prost	2022-12-22 07:04:35 -08:00
Cargo.toml	cargo: bump regex from 1.8.1 to 1.8.2	2023-05-23 16:13:49 +00:00