diff lispref/keymaps.texi @ 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 dbf3b04f858a
children 169802a49fb5
line wrap: on
line diff