Mercurial > emacs
diff src/ChangeLog.2 @ 47209:f06f993cfd92
(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.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 03 Sep 2002 01:20:20 +0000 |
parents | eac4b1ccb6b8 |
children | 1aba10ab73b4 |