Martin von Zweigbergk 9b59461242 git: add test for concurrent change in git repo between exports ... If you update a branch using regular `git` (or some Git-based tool) between two `jj git export`, we will overwrite that change if you had also changed the branch in jj land. There's a similar problem if you delete the branch in jj land. Let's have a test for that. I'm going to make us not overwrite it soon. This patch adds a test for those cases, plus many other cases in consistent way. Since the new test covers some cases tested by existing tests, I removed those tests.		2022-12-03 09:32:49 -08:00
..
src	local_backend: switch from Thrift back to Protobuf	2022-12-02 19:29:45 -08:00
tests	git: add test for concurrent change in git repo between exports	2022-12-03 09:32:49 -08:00
testutils	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
build.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
Cargo.toml	cargo: bump insta from 1.21.1 to 1.21.2	2022-11-28 05:29:03 -10:00