diff --git a/lib/src/local_working_copy.rs b/lib/src/local_working_copy.rs
index 10ae13317..cd6ce7b7f 100644
--- a/lib/src/local_working_copy.rs
+++ b/lib/src/local_working_copy.rs
@@ -1523,7 +1523,7 @@ impl FileSnapshotter<'_> {
                     data.conflict_marker_len as usize
                 }),
             )
-            .block_on()?;
+            .await?;
             match new_file_ids.into_resolved() {
                 Ok(file_id) => {
                     // On Windows, we preserve the executable bit from the merged trees.