| Mon, 07 Jan 2008 02:45:14 +0000 |
Glenn Morris |
Add 2008 to copyright years.
|
| Thu, 16 Aug 2007 20:04:36 +0000 |
Stefan Monnier |
(smerge-resolve): New arg `safe'.
|
| Wed, 25 Jul 2007 04:47:42 +0000 |
Glenn Morris |
Switch license to GPLv3 or later.
|
| Thu, 08 Mar 2007 20:12:55 +0000 |
Stefan Monnier |
(smerge-remove-props): Don't mark the buffer modified.
|
| Sun, 21 Jan 2007 03:53:13 +0000 |
Glenn Morris |
Add 2007 to copyright years.
|
| Sun, 30 Apr 2006 15:49:08 +0000 |
Stefan Monnier |
Update my email address.
|
| Mon, 06 Feb 2006 15:23:23 +0000 |
Thien-Thi Nguyen |
Update years in copyright notice; nfc.
|
| 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.
|
| Thu, 15 Apr 2004 20:46:54 +0000 |
Stefan Monnier |
(smerge-match-conflict): Fix last change.
|
| Thu, 15 Apr 2004 20:19:11 +0000 |
Stefan Monnier |
(smerge-match-conflict): Try to do something sensible
|
| Wed, 14 Apr 2004 17:40:57 +0000 |
Stefan Monnier |
(smerge-popup-context-menu): Use it.
|
| Tue, 23 Mar 2004 19:56:42 +0000 |
Stefan Monnier |
(smerge-mode-menu): Fix activate pred for resolve.
|
| Tue, 16 Mar 2004 16:27:10 +0000 |
Masatake YAMATO |
(smerge-popup-context-menu): Put `unwind-protect' arround `overlay-put' and `popup-menu'.
|
| Mon, 15 Mar 2004 11:27:47 +0000 |
Masatake YAMATO |
2004-03-15 Masatake YAMATO <jet@gyve.org>
|
| Wed, 10 Mar 2004 23:42:37 +0000 |
Stefan Monnier |
(smerge-check-cache, smerge-check): New var and fun.
|
| Wed, 24 Dec 2003 16:09:13 +0000 |
Karoly Lorentey |
tag of miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-137
|
