git-merge-tree.txt: replace spurious HTML entity