Yuya Nishihara 4cdead34b4 conflicts: make materialize_merge_result() accept reference type ... Because the output of diff.hunks() is a list of [&BStr]s, a Merge object reconstructed from a diff hunk will be Merge<&BStr>. I'm not pretty sure if we'll implement conflict diffs in that way, but this change should be harmless anyway.		2024-11-21 10:50:37 +09:00
..
benches	style: add semicolon at the end of expressions used as statements	2024-10-04 22:29:13 +02:00
gen-protos	cargo: inherit lints configuration from workspace	2024-10-04 22:29:13 +02:00
proc-macros	style: remove useless uses of .iter()	2024-10-04 22:29:13 +02:00
src	conflicts: make materialize_merge_result() accept reference type	2024-11-21 10:50:37 +09:00
tests	rewrite: fix duplicated commits to be rebased onto destination	2024-11-21 10:49:51 +09:00
testutils	transaction: propagate errors from commit()	2024-11-13 23:05:24 -08:00
Cargo.toml	cargo: import fix_filter from gix::filter::plumbing	2024-11-14 22:38:04 +09:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00