Revert "Merge branch 'js/notes'"

diff --git a/Documentation/config.txt b/Documentation/config.txt
index eeb2b0d353583e9406afc23fe053f56f6244aa73..1806a606100095fa1238076efed57ba7e79142aa 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -556,8 +556,8 @@ color.interactive::
 
 color.interactive.<slot>::
        Use customized color for 'git-add --interactive'
-       output. `<slot>` may be `prompt`, `header`, or `help`, for
-       three distinct types of normal output from interactive
+       output. `<slot>` may be `prompt`, `header`, `help` or `error`, for
+       four distinct types of normal output from interactive
        programs.  The values of these variables may be specified as
        in color.branch.<slot>.