| Wed, 13 Jan 2010 00:35:10 -0800 |
Glenn Morris |
Add 2010 to copyright years.
|
| Sun, 04 Oct 2009 02:11:57 +0000 |
Juanma Barranquero |
Fix typos in comments.
|
| Tue, 08 Sep 2009 19:47:07 +0000 |
Stefan Monnier |
(smerge-remove-props, smerge-refine):
|
| Tue, 01 Sep 2009 07:24:13 +0000 |
Glenn Morris |
Mark face aliases with "-face" suffix as obsolete.
|
| Mon, 02 Feb 2009 13:01:06 +0000 |
Thien-Thi Nguyen |
(smerge-start-session): Add interactive spec.
|
| Mon, 05 Jan 2009 03:18:22 +0000 |
Glenn Morris |
Add 2009 to copyright years.
|
| Tue, 28 Oct 2008 20:43:44 +0000 |
Stefan Monnier |
Require diff-mode at run-time as well.
|
| Mon, 21 Jul 2008 14:20:24 +0000 |
Thien-Thi Nguyen |
Make auto-refining a minor mode, and diff- and smerge- use it.
|
| Mon, 12 May 2008 18:21:24 +0000 |
Stefan Monnier |
(smerge-apply-resolution-patch): Don't pass nil to `insert'.
|
| Sun, 11 May 2008 20:26:00 +0000 |
Reiner Steib |
(smerge-start-session): Revert unintended change in revision 1.69.
|
| Sun, 11 May 2008 19:00:41 +0000 |
Glenn Morris |
Re-fill copyright years.
|
| Sat, 10 May 2008 13:09:04 +0000 |
Reiner Steib |
(smerge-command-prefix): Fix custom type.
|
| Tue, 06 May 2008 07:58:00 +0000 |
Glenn Morris |
Switch to recommended form of GPLv3 permissions notice.
|
| Mon, 05 May 2008 06:16:20 +0000 |
Stefan Monnier |
(smerge-start-session): Don't call smerge-next if
|
| Fri, 11 Apr 2008 01:10:43 +0000 |
Stefan Monnier |
(smerge-apply-resolution-patch): Fix typo.
|
