git-merge: a bit more readable user guidance.