Just use Sublime Merge, it's probably the best GUI for Git there is.