New formula for git-imerge

git-imerge performs a merge between two branches incrementally. If
conflicts are encountered, figure out exactly which pairs of commits
conflict, and present the user with one pairwise conflict at a time for
resolution.

Closes #27042.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>