Shell wrappers for git, most notably git-resolve-interactive