rebase: implement --merge via the interactive machinery

diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt
index 526ba7be9ca08ff1925a387a4d98a9a3aaf867a8..61ca6d04c206dc5667ffe83b8dd3c9cc4d1ab31c 100644 (file)
--- a/Documentation/git-verify-pack.txt
+++ b/Documentation/git-verify-pack.txt
@@ -40,7 +40,7 @@ OUTPUT FORMAT
 -------------
 When specifying the -v option the format used is:
 
-       SHA-1 type size size-in-pack-file offset-in-packfile
+       SHA-1 type size size-in-packfile offset-in-packfile
 
 for objects that are not deltified in the pack, and