git-imerge (pypi): Incremental merge for git
Keywords: git|merge-conflicts|python