| Sun, 02 Jan 2011 15:50:46 -0800 |
Glenn Morris |
Add 2011 to FSF/AIST copyright years.
|
| Fri, 21 May 2010 03:05:50 +0200 |
Juanma Barranquero |
* smerge-mode.el: Fix typos.
|
| 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.
|
| Mon, 31 Mar 2008 02:57:39 +0000 |
Stefan Monnier |
(smerge-apply-resolution-patch): New fun.
|
| Mon, 31 Mar 2008 01:49:57 +0000 |
Stefan Monnier |
(smerge-refine): Allow highlighting other subparts in 3-way conflicts.
|
| Wed, 13 Feb 2008 15:10:57 +0000 |
Stefan Monnier |
(smerge-auto-combine-max-separation): New var.
|
| Wed, 30 Jan 2008 07:57:28 +0000 |
Miles Bader |
Merge from emacs--devo--0
|
| Wed, 09 Jan 2008 01:21:15 +0000 |
Miles Bader |
Merge from emacs--devo--0
|
| Thu, 06 Dec 2007 09:51:45 +0000 |
Miles Bader |
Merge from emacs--devo--0
|
| Sun, 11 Nov 2007 00:56:44 +0000 |
Miles Bader |
Merge from emacs--devo--0
|
| Sat, 27 Oct 2007 09:12:07 +0000 |
Miles Bader |
Merge from emacs--devo--0
|
| Sat, 20 Oct 2007 02:30:26 +0000 |
Miles Bader |
Merge from emacs--devo--0
|
| Sat, 20 Oct 2007 02:22:59 +0000 |
Miles Bader |
Merge from emacs--devo--0
|
| Thu, 11 Oct 2007 16:14:00 +0000 |
Miles Bader |
Merge from emacs--devo--0
|
| Tue, 21 Aug 2007 04:54:03 +0000 |
Miles Bader |
Merge from emacs--devo--0
|
| Fri, 27 Jul 2007 10:52:18 +0000 |
Miles Bader |
Merge from emacs--devo--0
|
| Sun, 18 Mar 2007 14:11:08 +0000 |
Miles Bader |
Merge from emacs--devo--0
|
| Fri, 26 Jan 2007 06:16:11 +0000 |
Miles Bader |
Merge from emacs--devo--0
|
| Tue, 02 May 2006 05:51:52 +0000 |
Miles Bader |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-58
|
| Wed, 08 Feb 2006 04:26:44 +0000 |
Miles Bader |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
|
| Mon, 16 Jan 2006 08:37:27 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
|
| Sun, 25 Sep 2005 22:07:01 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-85
|
| Sun, 11 Sep 2005 22:21:01 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-81
|
| Tue, 06 Sep 2005 00:25:20 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-79
|
| Fri, 26 Aug 2005 09:51:52 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
|
| Fri, 29 Jul 2005 01:54:54 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-74
|
| Thu, 07 Jul 2005 12:43:14 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68
|
| Fri, 24 Jun 2005 01:59:52 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-65
|
| Wed, 15 Jun 2005 23:32:15 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-63
|
| Sat, 09 Apr 2005 02:16:29 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35
|
| Mon, 28 Jun 2004 07:56:49 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
|
| Fri, 16 Apr 2004 12:51:06 +0000 |
Kenichi Handa |
Sync to HEAD
|
| Mon, 16 Jan 2006 00:03:54 +0000 |
Henrik Enberg |
sync with trunk
|
| Mon, 08 Sep 2003 11:56:09 +0000 |
Kenichi Handa |
New directory
|
| Wed, 16 Jan 2008 06:22:59 +0000 |
Dan Nicolaescu |
* smerge-mode.el (smerge-start-session): Rename from smerge-auto.
|
| Tue, 15 Jan 2008 21:40:09 +0000 |
Stefan Monnier |
(smerge-refine): Also work on "same change conflicts".
|
| Mon, 14 Jan 2008 07:38:05 +0000 |
Dan Nicolaescu |
* smerge-mode.el (smerge-auto): New function.
|
| Tue, 08 Jan 2008 20:46:54 +0000 |
Miles Bader |
Merge from emacs--rel--22
|
| Mon, 19 Nov 2007 08:50:04 +0000 |
Dan Nicolaescu |
* progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
|
| Thu, 08 Nov 2007 16:58:07 +0000 |
Stefan Monnier |
(smerge-refine-subst): Pass "-d" to diff.
|
| Sat, 20 Oct 2007 06:30:18 +0000 |
Dan Nicolaescu |
* term/x-win.el (x-gtk-stock-map, icon-map-list)
|
| Sat, 20 Oct 2007 01:52:22 +0000 |
Stefan Monnier |
(smerge-auto-refine): New var.
|
| Fri, 19 Oct 2007 15:59:13 +0000 |
Stefan Monnier |
Add word-granularity refinement.
|
| Tue, 09 Oct 2007 03:38:57 +0000 |
Stefan Monnier |
(smerge-refine-chopup-region): Add `preproc' argument.
|
| Sun, 22 Apr 2007 12:12:29 +0000 |
Karoly Lorentey |
Merged from emacs@sv.gnu.org
|
| Mon, 29 Jan 2007 22:21:19 +0000 |
Karoly Lorentey |
Merged from emacs@sv.gnu.org
|
