summaryrefslogtreecommitdiff
path: root/lisp/smerge-mode.el
Commit message (Expand)AuthorAgeFilesLines
* Add 'tools' to file keywords.Romain Francoise2005-10-261-1/+1
* (smerge-remove-props): Cause re-highlighting of the whole conflict.Stefan Monnier2005-09-231-1/+11
* (smerge-resolve): Pass args to smerge-remove-props.Richard M. Stallman2005-09-091-1/+1
* (smerge-refined-change): Add :group.Juanma Barranquero2005-08-261-1/+2
* (smerge-remove-props): Make the args non-optional.Stefan Monnier2005-08-251-6/+86
* (smerge-basic-map): Bind smerge-combine-with-next.Stefan Monnier2005-08-221-28/+84
* Update years in copyright notice; nfc.Thien-Thi Nguyen2005-08-061-1/+2
* (smerge-ediff): Use insert-buffer-substring.Stefan Monnier2005-07-261-1/+1
* Update FSF's address.Lute Kamstra2005-07-041-2/+2
* (smerge-mode): Add duplicate defvar near top.Richard M. Stallman2005-07-031-0/+3
* (smerge-ensure-match): Don't use `format' on `error' arguments.Juanma Barranquero2005-06-161-1/+1
* Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375Miles Bader2005-06-101-8/+16
* * mh-customize.el (mh-speedbar-selected-folder-face): Special caseDan Nicolaescu2005-04-081-2/+8
* (smerge-mode): Specify :group.Lute Kamstra2005-04-041-2/+2
* (smerge-diff-switches): Fix typo in docstring.Juanma Barranquero2004-04-301-3/+3
* (smerge-match-conflict): Fix last change.Stefan Monnier2004-04-151-1/+1
* (smerge-match-conflict): Try to do something sensibleStefan Monnier2004-04-151-4/+13
* (smerge-popup-context-menu): Use it.Stefan Monnier2004-04-141-2/+2
* (smerge-mode-menu): Fix activate pred for resolve.Stefan Monnier2004-03-231-47/+72
* (smerge-popup-context-menu): Put `unwind-protect' arround `overlay-put' and `...Masatake YAMATO2004-03-161-7/+9
* 2004-03-15 Masatake YAMATO <jet@gyve.org>Masatake YAMATO2004-03-151-16/+94
* (smerge-check-cache, smerge-check): New var and fun.Stefan Monnier2004-03-101-15/+47
* Previous change was bogus. Something odd in pcl-cvs...Dave Love2003-10-061-4/+3
* Comment.Dave Love2003-10-061-3/+4
* Add arch taglinesMiles Bader2003-09-011-1/+3
* Trailing whitespace deleted.Juanma Barranquero2003-02-041-7/+7
* (smerge-ediff): Autoload.Stefan Monnier2002-10-101-2/+18
* (smerge-ediff): Autoload.Stefan Monnier2002-10-101-1/+2
* (smerge-ediff): Add name-{mine,other,base} args.Stefan Monnier2002-10-041-6/+11
* (smerge-diff-buffer-name): Default to *vc-diff*.Stefan Monnier2002-09-031-21/+50
* Use find-file-hook instead of find-file-hooks.Stefan Monnier2002-08-151-2/+2
* (smerge-match-conflict): Fix typo.Stefan Monnier2001-11-151-5/+11
* (smerge-mode): Check if `font-lock-mode' is boundGerd Moellmann2001-07-311-3/+3
* (smerge-mode): Force font-lock-multiline to t.Stefan Monnier2001-05-101-1/+2
* (font-lock-keywords, font-lock-mode): Don't bind, just declare.Stefan Monnier2001-03-071-3/+3
* (smerge-font-lock-keywords): Relax submatch 1.Stefan Monnier2001-01-251-2/+2
* *** empty log message ***Stefan Monnier2000-12-231-39/+1
* (smerge-basic-map): Use `=' rather than `d'.Stefan Monnier2000-12-221-2/+8
* (smerge-basic-map): Use `=' rather than `d'.Stefan Monnier2000-12-221-7/+13
* (smerge-diff): Setup the buffer's default-directoryStefan Monnier2000-10-061-3/+12
* (smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):Miles Bader2000-10-051-6/+21
* (smerge-mode-menu): Doc fix.Stefan Monnier2000-08-161-4/+6
* (smerge-mode-menu): Fill it out.Dave Love2000-07-211-2/+22
* (smerge-diff-switches): Don't use list* in defcustom.Dave Love2000-05-251-3/+11
* (smerge-auto-leave): New function and variable.Stefan Monnier2000-03-221-41/+40
* New file. Provides a simple minor-mode for files containingStefan Monnier1999-12-091-0/+453
View Lorry Controller Status