* bogus cvs conflict in files.texi
@ 2008-01-09 4:13 Glenn Morris
0 siblings, 0 replies; only message in thread
From: Glenn Morris @ 2008-01-09 4:13 UTC (permalink / raw)
To: emacs-devel
I just commited a change to man/*.texi in EMACS_22_BASE via PCVS, and
saw this:
In directory .:
Message: cvs commit: warning: file `files.texi' seems to still contain
conflict indicators
I'm guessing this is due to the conflict example in that file. Does it
need further hiding from CVS somehow?
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-01-09 4:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-09 4:13 bogus cvs conflict in files.texi Glenn Morris
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.