Fix a formatting error in git-merge.txt