Martin von Zweigbergk de71df2447 conflicts: move conversion to FileId conflict to callers ... This simplifies a bit, in particular by removing the error case from `extract_file_conflict_as_single_hunk()`.		2023-06-07 13:45:16 -07:00
..
benches
gen-protos	cargo: bump prost-build from 0.11.8 to 0.11.9	2023-04-14 16:11:09 +00:00
src	conflicts: move conversion to FileId conflict to callers	2023-06-07 13:45:16 -07:00
tests	feat(revset): suggest similar branch names	2023-06-05 11:11:17 -05:00
testutils	cargo: bump git2 from 0.17.1 to 0.17.2	2023-05-29 20:25:04 +02:00
build.rs
Cargo.toml	cargo: bump once_cell from 1.17.2 to 1.18.0	2023-06-05 16:22:45 +00:00