Cole Miller 8ab25e2bac Fix merge conflicts jumping (#28508) ...

This regressed in #27568, oops.

Release Notes:

- Fixed a bug causing conflicted files in the git panel to jump to the
"Tracked" section as soon as they were staged.

2025-04-10 14:29:36 +00:00

..

src

Fix merge conflicts jumping (#28508)

2025-04-10 14:29:36 +00:00

Cargo.toml

Add workspace-hack (#27277)

2025-04-02 13:26:34 -07:00

LICENSE-GPL

chore: Change AGPL-licensed crates to GPL (except for collab) (#4231)

2024-01-24 00:26:58 +01:00