Documentation/git-merge.txt: weaken warning about uncommited changes