Merge branch 'js/c-merge-recursive'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 47ba9a403ae9379b87c54f0103297da9157237cb..b5d9763594b3fcb4dcc273c0118f7edbf236380d 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -36,6 +36,9 @@
        Turn off colored diff, even when the configuration file
        gives the default to color output.
 
+--color-words::
+       Show colored word diff, i.e. color words which have changed.
+
 --no-renames::
        Turn off rename detection, even when the configuration
        file gives the default to do so.