This website requires JavaScript.
Explore
Help
Sign In
martin
/
emacs
Watch
1
Star
0
Fork
0
You've already forked emacs
Code
Issues
Pull Requests
Packages
Projects
Releases
Wiki
Activity
Files
bb9d2b64478d7b52359cd61559621259414595dd
emacs
/
lisp
/
smerge-mode.el
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
13 KiB
Raw
Blame
History
View Raw
Reference in New Issue
View Git Blame
Copy Permalink