I can recommend https://www.sublimemerge.com https://www.sublimemerge.com It's fast and nice to work with. I actually use it in conjunction with the command li

I can recommend https://www.sublimemerge.com https://www.sublimemerge.com It's fast and nice to work with. I actually use it in conjunction with the command line (zsh w/ autocomplete so I normally only type the first one or two letters of each recurrent command to get the completion, hit return, done) specifically to pick those portions of each file that I want to go into a given commit. Occasionally I use some more advanced features like file history.