I use git icdiff (a plugin) in my terminal. I use Zed and VSCode GUI editors, but I don’t care to use their git tools. Command line git is fine.

https://www.jefftk.com/icdiff