log lisp/smerge-mode.el @ 54308:2d065d2b1e20

age author description
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.
Thu, 10 Oct 2002 17:30:20 +0000 Stefan Monnier (smerge-ediff): Autoload.
Thu, 10 Oct 2002 13:01:14 +0000 Stefan Monnier (smerge-ediff): Autoload.
Fri, 04 Oct 2002 15:25:22 +0000 Stefan Monnier (smerge-ediff): Add name-{mine,other,base} args.
Tue, 03 Sep 2002 01:20:20 +0000 Stefan Monnier (smerge-diff-buffer-name): Default to *vc-diff*.
Thu, 15 Aug 2002 00:48:20 +0000 Stefan Monnier Use find-file-hook instead of find-file-hooks.
Thu, 15 Nov 2001 01:25:35 +0000 Stefan Monnier (smerge-match-conflict): Fix typo.
Tue, 31 Jul 2001 08:28:43 +0000 Gerd Moellmann (smerge-mode): Check if `font-lock-mode' is bound
Thu, 10 May 2001 20:23:20 +0000 Stefan Monnier (smerge-mode): Force font-lock-multiline to t.
Wed, 07 Mar 2001 00:16:29 +0000 Stefan Monnier (font-lock-keywords, font-lock-mode): Don't bind, just declare.
Thu, 25 Jan 2001 15:36:32 +0000 Stefan Monnier (smerge-font-lock-keywords): Relax submatch 1.
Sat, 23 Dec 2000 20:54:14 +0000 Stefan Monnier *** empty log message ***