A graphical tool that works like https://github.com/mhagger/git-imerge
By chatting or signing in you agree to the Terms and chat-message logging (revocable in History).