| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Trailing whitespace deleted. | Juanma Barranquero | 2003-02-04 | 1 | -7/+7 |
| | | |||||
| * | (smerge-ediff): Autoload. | Stefan Monnier | 2002-10-10 | 1 | -2/+18 |
| | | | | | | | | (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. | ||||
| * | (smerge-ediff): Autoload. | Stefan Monnier | 2002-10-10 | 1 | -1/+2 |
| | | |||||
| * | (smerge-ediff): Add name-{mine,other,base} args. | Stefan Monnier | 2002-10-04 | 1 | -6/+11 |
| | | |||||
| * | (smerge-diff-buffer-name): Default to *vc-diff*. | Stefan Monnier | 2002-09-03 | 1 | -21/+50 |
| | | | | | | | (smerge-combine-with-next): New function. (smerge-diff): Don't output `wrote /tmp/foo' messages. Insert message if no diffs were found. | ||||
| * | Use find-file-hook instead of find-file-hooks. | Stefan Monnier | 2002-08-15 | 1 | -2/+2 |
| | | |||||
| * | (smerge-match-conflict): Fix typo. | Stefan Monnier | 2001-11-15 | 1 | -5/+11 |
| | | | | | (smerge-diff): Be careful to read match-data early enough. | ||||
| * | (smerge-mode): Check if `font-lock-mode' is bound | Gerd Moellmann | 2001-07-31 | 1 | -3/+3 |
| | | | | | before accessing it. | ||||
| * | (smerge-mode): Force font-lock-multiline to t. | Stefan Monnier | 2001-05-10 | 1 | -1/+2 |
| | | |||||
| * | (font-lock-keywords, font-lock-mode): Don't bind, just declare. | Stefan Monnier | 2001-03-07 | 1 | -3/+3 |
| | | |||||
| * | (smerge-font-lock-keywords): Relax submatch 1. | Stefan Monnier | 2001-01-25 | 1 | -2/+2 |
| | | |||||
| * | *** empty log message *** | Stefan Monnier | 2000-12-23 | 1 | -39/+1 |
| | | |||||
| * | (smerge-basic-map): Use `=' rather than `d'. | Stefan Monnier | 2000-12-22 | 1 | -2/+8 |
| | | | | | | | 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. | ||||
| * | (smerge-basic-map): Use `=' rather than `d'. | Stefan Monnier | 2000-12-22 | 1 | -7/+13 |
| | | | | | | Use minibuffer menu prompt for the `=' prefix. (smerge-command-prefix): Change default to C-^. | ||||
| * | (smerge-diff): Setup the buffer's default-directory | Stefan Monnier | 2000-10-06 | 1 | -3/+12 |
| | | | | | and add filename to the names so that diff-mode can jump to source. | ||||
| * | (smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face): | Miles Bader | 2000-10-05 | 1 | -6/+21 |
| | | | | | Add dark-background variants. | ||||
| * | (smerge-mode-menu): Doc fix. | Stefan Monnier | 2000-08-16 | 1 | -4/+6 |
| | | |||||
| * | (smerge-mode-menu): Fill it out. | Dave Love | 2000-07-21 | 1 | -2/+22 |
| | | |||||
| * | (smerge-diff-switches): Don't use list* in defcustom. | Dave Love | 2000-05-25 | 1 | -3/+11 |
| | | |||||
| * | (smerge-auto-leave): New function and variable. | Stefan Monnier | 2000-03-22 | 1 | -41/+40 |
| | | | | | | | | | (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. | ||||
| * | New file. Provides a simple minor-mode for files containing | Stefan Monnier | 1999-12-09 | 1 | -0/+453 |
| diff3-style conflict markers, such as generated by RCS | |||||
 |
index : delta/emacs.git | |
| git.savannah.gnu.org: git/emacs.git |
| summaryrefslogtreecommitdiff |