Merge branch 'mm/maint-hint-failed-merge' into maint

* mm/maint-hint-failed-merge:
user-manual: Document that "git merge" doesn't like uncommited changes.
merge-recursive: point the user to commit when file would be overwritten.

diff --cc Documentation/config.txt
Simple merge