Mercurial > emacs
comparison src/m/f301.h @ 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 | e075b0cbd57a |
children | 695cf19ef79e |
comparison
equal
deleted
inserted
replaced
26775:ea2b51ce35a7 | 26776:142d6aa7c470 |
---|