merge-one-file: use common as base, instead of emptiness.

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 06500d04b7f56507cd8bc379cb34b91b7056bf18..8eef86e474aee14bb6743f0f81d6aa802ef8a621 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -4,10 +4,6 @@
 -u::
        Synonym for "-p".
 
--r::
-       Look recursively in subdirectories; only used by "git-diff-tree";
-       other diff commands always work recursively.
-
 -z::
        \0 line termination on output
 
@@ -54,7 +50,7 @@
        <orderfile>, which has one shell glob pattern per line.
 
 -R::
-       Swap two inputs; that is, show differences from cache or
+       Swap two inputs; that is, show differences from index or
        on-disk file to tree contents.
 
 For more detailed explanation on these common options, see also