| Wed, 26 Oct 2005 08:38:07 +0000 |
Romain Francoise |
Add 'tools' to file keywords.
|
| Fri, 23 Sep 2005 18:15:20 +0000 |
Stefan Monnier |
(smerge-remove-props): Cause re-highlighting of the whole conflict.
|
| Fri, 09 Sep 2005 01:16:05 +0000 |
Richard M. Stallman |
(smerge-resolve): Pass args to smerge-remove-props.
|
| Fri, 26 Aug 2005 09:37:04 +0000 |
Juanma Barranquero |
(smerge-refined-change): Add :group.
|
| Thu, 25 Aug 2005 20:13:38 +0000 |
Stefan Monnier |
(smerge-remove-props): Make the args non-optional.
|
| Mon, 22 Aug 2005 14:38:51 +0000 |
Stefan Monnier |
(smerge-basic-map): Bind smerge-combine-with-next.
|
| Sat, 06 Aug 2005 22:13:43 +0000 |
Thien-Thi Nguyen |
Update years in copyright notice; nfc.
|
| Tue, 26 Jul 2005 16:07:55 +0000 |
Stefan Monnier |
(smerge-ediff): Use insert-buffer-substring.
|
| Mon, 04 Jul 2005 23:32:44 +0000 |
Lute Kamstra |
Update FSF's address.
|
| Sun, 03 Jul 2005 16:12:14 +0000 |
Richard M. Stallman |
(smerge-mode): Add duplicate defvar near top.
|
| Thu, 16 Jun 2005 14:34:12 +0000 |
Juanma Barranquero |
(smerge-ensure-match): Don't use `format' on `error' arguments.
|
| Fri, 10 Jun 2005 08:48:08 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
|
| Fri, 08 Apr 2005 14:26:13 +0000 |
Dan Nicolaescu |
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
|
| Mon, 04 Apr 2005 09:09:01 +0000 |
Lute Kamstra |
(smerge-mode): Specify :group.
|
| Fri, 30 Apr 2004 21:10:05 +0000 |
Juanma Barranquero |
(smerge-diff-switches): Fix typo in docstring.
|
