log lisp/smerge-mode.el @ 62320:250393a33b15

age author description
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
Mon, 06 Oct 2003 16:34:59 +0000 Dave Love Previous change was bogus. Something odd in pcl-cvs...
Mon, 06 Oct 2003 16:33:13 +0000 Dave Love Comment.
Mon, 01 Sep 2003 15:45:59 +0000 Miles Bader Add arch taglines
Tue, 04 Feb 2003 12:29:42 +0000 Juanma Barranquero Trailing whitespace deleted.