Commit graph

1 commit

Author SHA1 Message Date
Stefan Monnier
3dac25a972 New file. Provides a simple minor-mode for files containing
diff3-style conflict markers, such as generated by RCS
1999-12-09 13:03:41 +00:00