tags 368681 moreinfo stop Hello,
I cannot reproduce what you are describing. Could you please elaborate ? [creating a conflict manually] % cvs up RCS file: /home/staff/jd/test/toto/wqdwq,v retrieving revision 1.1 retrieving revision 1.2 Merging differences between 1.1 and 1.2 into wqdwq rcsmerge: warning: conflicts during merge cvs update: conflicts found in wqdwq C wqdwq % cvs ci cvs commit: Examining . cvs commit: file `wqdwq' had a conflict and has not been modified cvs [commit aborted]: correct above errors first! Cheers, -- Julien Danjou .''`. Debian Developer : :' : http://julien.danjou.info `. `' http://people.debian.org/~acid `- 9A0D 5FD9 EB42 22F6 8974 C95C A462 B51E C2FE E5CD
signature.asc
Description: Digital signature
