comparison lisp/smerge-mode.el @ 33431:5ca411467bf3

(cvs-fi-conflict-face): New var.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 12 Nov 2000 16:52:53 +0000
parents 44f7f2635fec
children 509ed3724af0
comparison
equal deleted inserted replaced
33430:d2648645aa9b 33431:5ca411467bf3