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