Have you tried Sublime Merge? Looks like a good git flow editor.

https://www.sublimemerge.com/