Martin von Zweigbergk 762c8984c6 trees: when merging trees and one is missing, treat it as empty ... When a directory is missing in one merge input (base or one side), we would consider that a merge conflict. This patch changes that so we instead merge trees by treating the missing tree as empty.		2022-04-20 13:47:03 -07:00
..
protos
src	trees: when merging trees and one is missing, treat it as empty	2022-04-20 13:47:03 -07:00
tests	trees: when merging trees and one is missing, treat it as empty	2022-04-20 13:47:03 -07:00
build.rs
Cargo.toml	cargo: bump config from 0.13.0 to 0.13.1	2022-04-14 08:57:35 -07:00