From: Nick Roberts <nickrob@snap.net.nz>
Date: Tue, 5 Aug 2008 08:05:17 +0000 (+0000)
Subject: (VC Directory Mode): Fix typo.
X-Git-Tag: emacs-pretest-23.0.90~3646
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5acbda73bb94158d2fc4f67203e76ddd4c79d134;p=emacs.git

(VC Directory Mode): Fix typo.
---

diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index e31d69703da..57c7cabe219 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -46,7 +46,7 @@ output is used.  Here is an example using RCS:
                        ./
     modified           file1.c
     needs-update       file2.c
-    needs-merge        file2.c
+    needs-merge        file3.c
 @end group
 @end smallexample