Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix broken merge (#25776)

Browse source 
Closes #ISSUE

Release Notes:

- N/A *or* Added/Fixed/Improved ...
This commit is contained in:
Cole Miller 2025-02-27 15:48:14 -05:00 • committed by GitHub
parent 7ec3702b47
commit 482a45feac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/git_ui/src/project_diff.rs
View file

@ -1076,7 +1076,7 @@ mod tests {
cx.run_until_parked(); cx.run_until_parked();
let editor = cx.update_window_entity(&diff, |diff, window, cx| { 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()), PathKey::namespaced(TRACKED_NAMESPACE, Path::new("foo").into()),
window, window,
cx, cx,
@ -1097,7 +1097,7 @@ mod tests {
); );
let editor = cx.update_window_entity(&diff, |diff, window, cx| { 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()), PathKey::namespaced(TRACKED_NAMESPACE, Path::new("bar").into()),
window, window,
cx, cx,