Mercurial > emacs

diff src/fontset.h @ 29565:a5845156564d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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 04099a17871f
children 2b0359c5b384
line wrap: on
line diff