|
| From: | Glenn Morris |
| Subject: | bogus cvs conflict in files.texi |
| Date: | Tue, 08 Jan 2008 23:13:31 -0500 |
| User-agent: | Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
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?
| [Prev in Thread] | Current Thread | [Next in Thread] |