Martin von Zweigbergk 4e8fbaa210 git: allow conflicts in "HEAD@git" ... Git's HEAD ref is similar to other refs and can logically have conflicts just like the other refs in `git_refs`. As with the other refs, it can happen if you run concurrent commands importing two different updates from Git. So let's treat `git_head` the same as `git_refs` by making it an `Option<RefTarget>`.		2023-01-30 09:05:03 -08:00
..
gen-protos
src	git: allow conflicts in "HEAD@git"	2023-01-30 09:05:03 -08:00
tests	git: allow conflicts in "HEAD@git"	2023-01-30 09:05:03 -08:00
testutils
build.rs
Cargo.toml	cargo: bump pest_derive from 2.5.3 to 2.5.4	2023-01-25 07:49:05 -08:00