[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-commit] emacs/lisp smerge-mode.el
From: |
Stefan Monnier |
Subject: |
[Emacs-commit] emacs/lisp smerge-mode.el |
Date: |
Mon, 02 Sep 2002 21:20:21 -0400 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier+gnu/address@hidden> 02/09/02
21:20:21
Modified files:
lisp : smerge-mode.el
Log message:
(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.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/smerge-mode.el.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-commit] emacs/lisp smerge-mode.el,
Stefan Monnier <=