diff src/doc.c @ 26776:142d6aa7c470

New file. Provides a simple minor-mode for files containing diff3-style conflict markers, such as generated by RCS
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 09 Dec 1999 13:00:21 +0000
parents b1863c0b8f9c
children 60c820c7f330
line wrap: on
line diff