Use a hashtable for objects instead of a sorted list

[git.git] / Documentation / git-merge-index.txt

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 6030642..fbc986a 100644 (file)
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -20,7 +20,7 @@ files are passed as arguments 5, 6 and 7.
 OPTIONS
 -------
 --::
-       Interpret all following arguments as filenames.
+       Do not interpret any more arguments as options.
 
 -a::
        Run merge against all files in the index that need merging.