Mercurial > emacs
diff lisp/ChangeLog @ 50322:445b4a2ecf62
*** empty log message ***
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Thu, 27 Mar 2003 22:40:29 +0000 |
parents | e0b9e9b6bfac |
children | e5ff1f539de2 |
line wrap: on
line diff
--- 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.