Juanma Barranquero
f1180544bb
Trailing whitespace deleted.
2003-02-04 12:29:42 +00:00
Stefan Monnier
a48402c999
(smerge-ediff): Autoload.
...
(smerge-match-conflict): Don't assume as much about smerge-begin-re.
(smerge-resolve-function): New var.
(smerge-resolve): New command.
(smerge-basic-map): Bind it.
2002-10-10 17:30:20 +00:00
Stefan Monnier
a1038ca045
(smerge-ediff): Autoload.
2002-10-10 13:01:14 +00:00
Stefan Monnier
15092da1f1
(smerge-ediff): Add name-{mine,other,base} args.
2002-10-04 15:25:22 +00:00
Stefan Monnier
814838dff6
(smerge-diff-buffer-name): Default to *vc-diff*.
...
(smerge-combine-with-next): New function.
(smerge-diff): Don't output `wrote /tmp/foo' messages.
Insert message if no diffs were found.
2002-09-03 01:20:20 +00:00
Stefan Monnier
1a4914f340
Use find-file-hook instead of find-file-hooks.
2002-08-15 00:48:20 +00:00
Stefan Monnier
e29f823e0d
(smerge-match-conflict): Fix typo.
...
(smerge-diff): Be careful to read match-data early enough.
2001-11-15 01:25:35 +00:00
Gerd Moellmann
0304b9c787
(smerge-mode): Check if `font-lock-mode' is bound
...
before accessing it.
2001-07-31 08:28:43 +00:00
Stefan Monnier
0f49941f67
(smerge-mode): Force font-lock-multiline to t.
2001-05-10 20:23:48 +00:00
Stefan Monnier
f5cd98c0d4
(font-lock-keywords, font-lock-mode): Don't bind, just declare.
2001-03-07 00:16:29 +00:00
Stefan Monnier
f0c1adabcb
(smerge-font-lock-keywords): Relax submatch 1.
2001-01-25 15:37:21 +00:00
Stefan Monnier
83f40583a4
*** empty log message ***
2000-12-23 20:54:14 +00:00
Stefan Monnier
6eabfb2600
(smerge-basic-map): Use =' rather than d'.
...
Use minibuffer menu prompt for the `=' prefix.
(smerge-command-prefix): Change default to C-^.
(smerge-mode): Don't assume font-lock doesn't move point.
2000-12-22 23:19:47 +00:00
Stefan Monnier
0e86b6b04b
(smerge-basic-map): Use =' rather than d'.
...
Use minibuffer menu prompt for the `=' prefix.
(smerge-command-prefix): Change default to C-^.
2000-12-22 22:59:17 +00:00
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
