Merge branch 'sb/clean-test-fix' into HEAD

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 32f48ed6471946aa8baf2d51113834804cd09b47..4b0318e2ac159eb56ff4fbafe2f3c2ebfa374392 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -26,12 +26,12 @@ ifndef::git-format-patch[]
 ifdef::git-diff[]
        This is the default.
 endif::git-diff[]
-endif::git-format-patch[]
 
 -s::
 --no-patch::
        Suppress diff output. Useful for commands like `git show` that
        show the patch by default, or to cancel the effect of `--patch`.
+endif::git-format-patch[]
 
 -U<n>::
 --unified=<n>::