commit 2c8899b952f67f90ab3a26b4331491832fe93c8a from: Omar Polo date: Sat Jul 23 13:17:28 2022 UTC drop (needless?) sleep(1) in status.sh ok stsp commit - 38d61ead4d6e9ff3f44b8d6e0e7ff3d02ffcec26 commit + 2c8899b952f67f90ab3a26b4331491832fe93c8a blob - 9b3e14a5ef5e69c05593264d58ab8c443af6b692 blob + 96ab8703a99e287bd3ac0a498addcbfb9ac8ebce --- regress/cmdline/status.sh +++ regress/cmdline/status.sh @@ -345,7 +345,6 @@ test_status_shows_no_mods_after_complete_merge() { sed -i 's/2/22/' $testroot/repo/numbers git_commit $testroot/repo -m "modified line 2" - sleep 1 # modify line 2 again; no local changes are left after merge sed -i 's/2/22/' $testroot/wt/numbers