chore: merge develop into fix/tmutil-error-handling

django23 · django23 · commit 7fd9b585a01a · 2026-02-19T21:01:27.000+01:00
diff --git a/tests/behavior.bats b/tests/behavior.bats
@@ -143,7 +143,6 @@ load test_helper
 }
 
 # =============================================================================
-<<<<<<< HEAD
 # Skip already-excluded directories (mdfind optimization)
 # =============================================================================
 

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,6 @@ load test_helper`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`# =============================================================================`
`146`		`-<<<<<<< HEAD`
`147`	`146`	`# Skip already-excluded directories (mdfind optimization)`
`148`	`147`	`# =============================================================================`
`149`	`148`