Merge branch 'ah/branch-autosetupmerge-grammofix'

Fix grammar of a message introduced in previous round. * ah/branch-autosetupmerge-grammofix: push: improve grammar of branch.autoSetupMerge advice