Stefan Monnier
d73aed133b
(smerge-diff): Setup the buffer's default-directory
...
and add filename to the names so that diff-mode can jump to source.
2000-10-06 16:07:31 +00:00
Miles Bader
b25f5aecdf
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
...
Add dark-background variants.
2000-10-05 06:05:51 +00:00
Stefan Monnier
394bd1cae1
(smerge-mode-menu): Doc fix.
2000-08-16 19:51:55 +00:00
Dave Love
43e764c952
(smerge-mode-menu): Fill it out.
2000-07-21 13:53:20 +00:00
Dave Love
a7b779771d
(smerge-diff-switches): Don't use list* in defcustom.
2000-05-25 18:08:26 +00:00
Stefan Monnier
f97e9a8a43
(smerge-auto-leave): New function and variable.
...
(smerge-basic-map): Rename from smerge-basic-keymap.
Change the bindings for smerge-diff-*.
(smerge-*-map): Use easy-mmode-defmap.
(smerge-(next|prev)): Use easy-mmode-define-navigation.
(smerge-keep-*): Use smerge-auto-leave.
2000-03-22 00:54:55 +00:00
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
