Benjamin Tan 0e472166f1 merge: add get_simplified_mapping and update_from_simplified methods		2024-06-15 06:05:06 +08:00
..
benches
gen-protos
proc-macros	cargo: explicitly indicate paths to publish	2024-04-15 20:37:00 -07:00
src	merge: add get_simplified_mapping and update_from_simplified methods	2024-06-15 06:05:06 +08:00
tests	tests: add tests showing that individual file conflicts are not simplified/deduplicated	2024-06-15 06:05:06 +08:00
testutils	backend: add error variant for access denied, handle when diffing	2024-05-30 18:27:38 -07:00
Cargo.toml	In lib, make "testing" feature depend on "git"	2024-06-11 17:14:57 -07:00
LICENSE