gitconfig: add alias to help resolve merges