Martin von Zweigbergk 18a25a7c2b tests: demonstrate spurious branch conflict after git export ... This is a test case for #463. It's not exactly the same case, but I'm confident that the root cause is the same (that the `.jj/repo/git_export_operation_id` doesn't include the git refs we just updated).		2022-11-13 15:06:10 -08:00
..
src	simple_op_store: replace Protobuf by Thrift	2022-11-13 11:39:33 -08:00
tests	tests: demonstrate spurious branch conflict after git export	2022-11-13 15:06:10 -08:00
testutils	tests: move testutils module into separate crate	2022-11-08 07:29:35 -08:00
build.rs
Cargo.toml	simple_op_store: replace Protobuf by Thrift	2022-11-13 11:39:33 -08:00