Merge branch 'mg/doc-status-color-slot' into maint

Documentation fixes.

* mg/doc-status-color-slot:
config,completion: add color.status.unmerged

diff --cc Documentation/config.txt
index efc7e68278a2ae32fa0ebf1efe3bad78fc238743,17796252974c51ea91672ab246ebede613ebe676..1a8ddb41c7fff8cce5d2c0a51a9d642e3bf0fd42
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -983,9 -957,12 +983,10 @@@ color.status.<slot>:
        `added` or `updated` (files which are added but not committed),
        `changed` (files which are changed but not added in the index),
        `untracked` (files which are not tracked by Git),
-       `branch` (the current branch), or
+       `branch` (the current branch),
        `nobranch` (the color the 'no branch' warning is shown in, defaulting
-       to red).
+       to red), or
+       `unmerged` (files which have unmerged changes).
 -      The values of these variables may be specified as in
 -      color.branch.<slot>.
  
  color.ui::
        This variable determines the default value for variables such