diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-09-03 01:20:20 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-09-03 01:20:20 +0000 |
| commit | 814838dff648d9d877d80edea2ddbbb6781022fb (patch) | |
| tree | 431d8e38e5db627e14f4152ea34a041d0a1a6109 /lisp/emacs-lisp/autoload.el | |
| parent | a56f616a7d4d118679421f7a9f4b4be17521a0e9 (diff) | |
| download | emacs-814838dff648d9d877d80edea2ddbbb6781022fb.tar.gz emacs-814838dff648d9d877d80edea2ddbbb6781022fb.tar.bz2 emacs-814838dff648d9d877d80edea2ddbbb6781022fb.zip | |
(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.
Diffstat (limited to 'lisp/emacs-lisp/autoload.el')
0 files changed, 0 insertions, 0 deletions