merge-recursive: don't segfault while handling rename clashes

diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt
index e598cdda45cf0b953a106d6786765b3316e2cc16..9310b650d3ca6b6cb7d69814eb9b800e8c2c85cd 100644 (file)
--- a/Documentation/everyday.txt
+++ b/Documentation/everyday.txt
@@ -98,7 +98,7 @@ Use a tarball as a starting point for a new repository.::
 ------------
 $ tar zxf frotz.tar.gz
 $ cd frotz
-$ git-init
+$ git init
 $ git add . <1>
 $ git commit -m "import of frotz source tree."
 $ git tag v2.43 <2>