Scott Taylor 9674852dc7 conflicts: allow CRLF line endings on conflict markers ... Currently, conflict markers ending in CRLF line endings aren't allowed. I don't see any reason why we should reject them, since some editors/tools might produce CRLF automatically on Windows when saving files, which would break the conflicts otherwise.		2024-11-22 18:00:05 -06: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: allow CRLF line endings on conflict markers	2024-11-22 18:00:05 -06:00
tests	conflicts: allow CRLF line endings on conflict markers	2024-11-22 18:00:05 -06: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