.gitconfig: -# ChangeLog merge attempt