log lisp/smerge-mode.el @ 81900:39d8b226d67f

age author description
2007-03-08 Stefan Monnier (smerge-remove-props): Don't mark the buffer modified.
2007-01-21 Glenn Morris Add 2007 to copyright years.
2006-04-30 Stefan Monnier Update my email address.
2006-02-06 Thien-Thi Nguyen Update years in copyright notice; nfc.
2005-10-26 Romain Francoise Add 'tools' to file keywords.
2005-09-23 Stefan Monnier (smerge-remove-props): Cause re-highlighting of the whole conflict.
2005-09-09 Richard M. Stallman (smerge-resolve): Pass args to smerge-remove-props.
2005-08-26 Juanma Barranquero (smerge-refined-change): Add :group.
2005-08-25 Stefan Monnier (smerge-remove-props): Make the args non-optional.
2005-08-22 Stefan Monnier (smerge-basic-map): Bind smerge-combine-with-next.
2005-08-06 Thien-Thi Nguyen Update years in copyright notice; nfc.
2005-07-26 Stefan Monnier (smerge-ediff): Use insert-buffer-substring.
2005-07-04 Lute Kamstra Update FSF's address.
2005-07-03 Richard M. Stallman (smerge-mode): Add duplicate defvar near top.
2005-06-16 Juanma Barranquero (smerge-ensure-match): Don't use `format' on `error' arguments.
2005-06-10 Miles Bader Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
2005-04-08 Dan Nicolaescu * mh-customize.el (mh-speedbar-selected-folder-face): Special case
2005-04-04 Lute Kamstra (smerge-mode): Specify :group.
2004-04-30 Juanma Barranquero (smerge-diff-switches): Fix typo in docstring.
2004-04-15 Stefan Monnier (smerge-match-conflict): Fix last change.
2004-04-15 Stefan Monnier (smerge-match-conflict): Try to do something sensible
2004-04-14 Stefan Monnier (smerge-popup-context-menu): Use it.
2004-03-23 Stefan Monnier (smerge-mode-menu): Fix activate pred for resolve.
2004-03-16 Masatake YAMATO (smerge-popup-context-menu): Put `unwind-protect' arround `overlay-put' and `popup-menu'.
2004-03-15 Masatake YAMATO 2004-03-15 Masatake YAMATO <jet@gyve.org>
2004-03-10 Stefan Monnier (smerge-check-cache, smerge-check): New var and fun.
2003-12-24 Karoly Lorentey tag of miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-137
2003-10-06 Dave Love Previous change was bogus. Something odd in pcl-cvs...
2003-10-06 Dave Love Comment.
2003-09-01 Miles Bader Add arch taglines
2003-02-04 Juanma Barranquero Trailing whitespace deleted.
2002-10-10 Stefan Monnier (smerge-ediff): Autoload.
2002-10-10 Stefan Monnier (smerge-ediff): Autoload.
2002-10-04 Stefan Monnier (smerge-ediff): Add name-{mine,other,base} args.
2002-09-03 Stefan Monnier (smerge-diff-buffer-name): Default to *vc-diff*.
2002-08-15 Stefan Monnier Use find-file-hook instead of find-file-hooks.
2001-11-15 Stefan Monnier (smerge-match-conflict): Fix typo.
2001-07-31 Gerd Moellmann (smerge-mode): Check if `font-lock-mode' is bound
2001-05-10 Stefan Monnier (smerge-mode): Force font-lock-multiline to t.
2001-03-07 Stefan Monnier (font-lock-keywords, font-lock-mode): Don't bind, just declare.
2001-01-25 Stefan Monnier (smerge-font-lock-keywords): Relax submatch 1.
2000-12-23 Stefan Monnier *** empty log message ***
2000-12-22 Stefan Monnier (smerge-basic-map): Use `=' rather than `d'.
2000-12-22 Stefan Monnier (smerge-basic-map): Use `=' rather than `d'.
2000-10-06 Stefan Monnier (smerge-diff): Setup the buffer's default-directory
2000-10-05 Miles Bader (smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
2000-08-16 Stefan Monnier (smerge-mode-menu): Doc fix.
2000-07-21 Dave Love (smerge-mode-menu): Fill it out.
2000-05-25 Dave Love (smerge-diff-switches): Don't use list* in defcustom.
2000-03-22 Stefan Monnier (smerge-auto-leave): New function and variable.
1999-12-09 Stefan Monnier New file. Provides a simple minor-mode for files containing