diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 1999-12-09 13:03:41 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 1999-12-09 13:03:41 +0000 |
| commit | 3dac25a97282fd026de4abe51496f752da1929fd (patch) | |
| tree | 1d56b28b48be7bd47fd84db4e16d51f3118ac528 /lisp/mail/feedmail.el | |
| parent | 041470d2d9125f8459708b39da8e29c4c51fb70e (diff) | |
| download | emacs-3dac25a97282fd026de4abe51496f752da1929fd.tar.gz emacs-3dac25a97282fd026de4abe51496f752da1929fd.tar.bz2 emacs-3dac25a97282fd026de4abe51496f752da1929fd.zip | |
New file. Provides a simple minor-mode for files containing
diff3-style conflict markers, such as generated by RCS
Diffstat (limited to 'lisp/mail/feedmail.el')
0 files changed, 0 insertions, 0 deletions