# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1048804829 0
# Node ID 445b4a2ecf620f059733ab7c00b42f6faacb3d12
# Parent  17ff9d10125f585a19b42064f2f9f8f67f5b7b43
*** empty log message ***

diff -r 17ff9d10125f -r 445b4a2ecf62 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Mar 27 22:38:38 2003 +0000
+++ b/lisp/ChangeLog	Thu Mar 27 22:40:29 2003 +0000
@@ -1,3 +1,8 @@
+2003-03-27  Andreas Schwab  <schwab@suse.de>
+
+	* vc-cvs.el (vc-cvs-parse-entry): Make sure a file with conflicts
+	is marked as edited.
+
 2003-03-26  Kenichi Handa  <handa@etlken2>
 
 	* files.el (recode-file-name): New function.