@aral ... and I just realized that before switching to nvim as my main editor, I used Sublime Text AND Merge.
I probably have a license around here somewhere... that's a good idea, I could use Sublime Merge for git management, and continue my nvim usage.
Thanks for reminding me about Merge 🙂