log lisp/smerge-mode.el @ 93809:3ff2b47de8f2

age author description
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