view src/ChangeLog @ 29565:a5845156564d

(cvs-parse-table): Look for conflict markers in the file to resolve the ambiguity between C-conflict and C-need-merge.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 11 Jun 2000 22:30:49 +0000
parents ba2f35b91d3e
children a68f208f3dba
line wrap: on
line source

(binary:application/octet-stream)