From 482a45feacdddba417deaf92e9751aa2a4de5c66 Mon Sep 17 00:00:00 2001 From: Cole Miller Date: Thu, 27 Feb 2025 15:48:14 -0500 Subject: [PATCH] Fix broken merge (#25776) Closes #ISSUE Release Notes: - N/A *or* Added/Fixed/Improved ... --- crates/git_ui/src/project_diff.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs index db7510d867..e4c0e25671 100644 --- a/crates/git_ui/src/project_diff.rs +++ b/crates/git_ui/src/project_diff.rs @@ -1076,7 +1076,7 @@ mod tests { cx.run_until_parked(); let editor = cx.update_window_entity(&diff, |diff, window, cx| { - diff.scroll_to_path( + diff.move_to_path( PathKey::namespaced(TRACKED_NAMESPACE, Path::new("foo").into()), window, cx, @@ -1097,7 +1097,7 @@ mod tests { ); let editor = cx.update_window_entity(&diff, |diff, window, cx| { - diff.scroll_to_path( + diff.move_to_path( PathKey::namespaced(TRACKED_NAMESPACE, Path::new("bar").into()), window, cx,