A graphical tool that works like https://github.com/mhagger/git-imerge