Documentation/git-merge.txt: fix formatting of example block