merge-options.txt: Clarify merge --squash

With the --squash option, merge sets up the index just like for a real
merge, but without the merge info (stages). Say so.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/merge-options.txt

@@ -39,7 +39,8 @@
 
 --squash::
 	Produce the working tree and index state as if a real
-	merge happened, but do not actually make a commit or
+	merge happened (except for the merge information),
+	but do not actually make a commit or
 	move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to
 	cause the next `git commit` command to create a merge
 	commit.  This allows you to create a single commit on