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. (Update to add -h to the test for it to pass)