Magit-imerge is a Magit interface to git-imerge, a Git extension for performing incremental merges. See git-imerge's homepage for more information about git-imerge. The commentary in magit-imerge.el provides an overview of Magit-imerge commands.