After moving to Zed I also missed good Git integration that I had in VSCode with GitLens.

That pushed me to finally try Jujutsu instead of Git, since it has a CLI (and TUI and GUI, if that's your thing) that are perfectly usable by mere mortals. Now I feel as fast as when I had the Git integration, despite using the terminal.

But if I had stuck to Git, trying GitButler or Sublime Merge was the next option on my TODO list.