Documentation/git-merge.txt: Partial rewrite of How Merge Works