]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 041470d) | patch
New file. Provides a simple minor-mode for files containing
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 9 Dec 1999 13:03:41 +0000 (13:03 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 9 Dec 1999 13:03:41 +0000 (13:03 +0000)
commit3dac25a97282fd026de4abe51496f752da1929fd
tree1d56b28b48be7bd47fd84db4e16d51f3118ac528tree | snapshot
parent041470d2d9125f8459708b39da8e29c4c51fb70ecommit | diff
New file.  Provides a simple minor-mode for files containing
diff3-style conflict markers, such as generated by RCS
lisp/ChangeLog diff | blob | history
lisp/smerge-mode.el [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.