Add git-imerge from https://github.com/mhagger/git-imerge