[Emacs-diffs] Changes to emacs/doc/emacs/vc1-xtra.texi,v

[Nick Roberts]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Nick Roberts <nickrob>  08/08/05 08:05:17

Index: vc1-xtra.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/vc1-xtra.texi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- vc1-xtra.texi       2 Aug 2008 19:21:11 -0000       1.8
+++ vc1-xtra.texi       5 Aug 2008 08:05:17 -0000       1.9
@@ -46,7 +46,7 @@
                        ./
     modified           file1.c
     needs-update       file2.c
-    needs-merge        file2.c
+    needs-merge        file3.c
 @end group
 @end smallexample