Sublime merge — Something to take a look at for use with Git. As a cli only user of Git GUI tools always look to be very difficult, because it hides what's going on.