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