Martin von Zweigbergk dabfd04da6 tests: attempt to de-flake operation-merging test ... We resolve checkouts in favor of the first-committed operation (which is more likely to have managed to update the working copy). The test case has been flaky on GitHub lately. I've run it 1000 times on my machine without failure. I don't know if GitHub's machines are just faster in some way (SSD, maybe) that makes them finish the two operations in the test in the same millisecond. Let's add a 1-millisecond sleep to see if that helps. If it doesn't, then maybe the issue is that the clock has lower precision (or their clocks can go backwards?).		2022-02-09 11:15:10 -08:00
..
benches	project: rename project from Jujube to Jujutsu	2021-05-15 10:28:40 -07:00
protos	working_copy: keep track of workspace ID (#13)	2022-02-02 08:15:22 -08:00
src	working_copy: make sure discarded update is not visible	2022-02-09 10:40:51 -08:00
tests	tests: attempt to de-flake operation-merging test	2022-02-09 11:15:10 -08:00
build.rs	rustfmt: configure to group imports	2021-03-14 10:46:25 -07:00
Cargo.toml	cargo: upgrade to Rust 2021 (just to stay up to date)	2021-12-13 21:47:00 -08:00