HCoop / bpt / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a56f616) | patch
(smerge-diff-buffer-name): Default to *vc-diff*.
authorStefan Monnier <monnier@iro.umontreal.ca>
Tue, 3 Sep 2002 01:20:20 +0000 (01:20 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Tue, 3 Sep 2002 01:20:20 +0000 (01:20 +0000)
commit814838dff648d9d877d80edea2ddbbb6781022fb
tree431d8e38e5db627e14f4152ea34a041d0a1a6109tree | snapshot (tar.gz zip)
parenta56f616a7d4d118679421f7a9f4b4be17521a0e9commit | diff
(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.
lisp/smerge-mode.el diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.