Merge pull request #24553 from ndowens/git-imerge
git-imerge: 0.7.0 -> 1.0.0
authored by Jörg Thalheim and committed by GitHub 8 years ago 3e7c485e dac0e94e