Merge branch 'ma/up-to-date'

Message and doc updates.

* ma/up-to-date:
treewide: correct several "up-to-date" to "up to date"
Documentation/user-manual: update outdated example output

diff --cc Documentation/git-merge.txt
Simple merge

diff --cc Documentation/githooks.txt
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc git-merge-octopus.sh
Simple merge

diff --cc notes-merge.c
Simple merge

diff --cc remote.c
Simple merge

diff --cc t/t6040-tracking-info.sh
Simple merge

diff --cc unpack-trees.c
Simple merge