summaryrefslogtreecommitdiff
path: root/lisp/smerge-mode.el
Commit message (Expand)AuthorAgeFilesLines
* (smerge-start-session): Add interactive spec.Thien-Thi Nguyen2009-02-021-0/+1
* Add 2009 to copyright years.Glenn Morris2009-01-051-1/+1
* Require diff-mode at run-time as well.Stefan Monnier2008-10-281-1/+2
* Make auto-refining a minor mode, and diff- and smerge- use it.Thien-Thi Nguyen2008-07-211-7/+2
* (smerge-apply-resolution-patch): Don't pass nil to `insert'.Stefan Monnier2008-05-121-1/+1
* (smerge-start-session): Revert unintended change in 2008-05-10T13:06:33Z!Rein...Reiner Steib2008-05-111-1/+2
* Re-fill copyright years.Glenn Morris2008-05-111-8/+6
* (smerge-command-prefix): Fix custom type.Reiner Steib2008-05-101-7/+11
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-061-6/+4
* (smerge-start-session): Don't call smerge-next ifStefan Monnier2008-05-051-1/+2
* (smerge-apply-resolution-patch): Fix typo.Stefan Monnier2008-04-111-21/+27
* (smerge-apply-resolution-patch): New fun.Stefan Monnier2008-03-311-27/+151
* (smerge-refine): Allow highlighting other subparts in 3-way conflicts.Stefan Monnier2008-03-311-9/+30
* (smerge-auto-combine-max-separation): New var.Stefan Monnier2008-02-131-0/+21
* * smerge-mode.el (smerge-start-session): Rename from smerge-auto.Dan Nicolaescu2008-01-161-1/+1
* (smerge-refine): Also work on "same change conflicts".Stefan Monnier2008-01-151-4/+32
* * smerge-mode.el (smerge-auto): New function.Dan Nicolaescu2008-01-141-0/+8
* Merge from emacs--rel--22Miles Bader2008-01-081-1/+1
|\
| * Add 2008 to copyright years.Glenn Morris2008-01-071-1/+1
* | * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):Dan Nicolaescu2007-11-191-0/+1
* | (smerge-refine-subst): Pass "-d" to diff.Stefan Monnier2007-11-081-3/+8
* | * term/x-win.el (x-gtk-stock-map, icon-map-list)Dan Nicolaescu2007-10-201-0/+1
* | (smerge-auto-refine): New var.Stefan Monnier2007-10-201-1/+13
* | Add word-granularity refinement.Stefan Monnier2007-10-191-38/+135
* | (smerge-refine-chopup-region): Add `preproc' argument.Stefan Monnier2007-10-091-25/+41
|/
* (smerge-resolve): New arg `safe'.Stefan Monnier2007-08-161-5/+46
* Switch license to GPLv3 or later.Glenn Morris2007-07-251-1/+1
* (smerge-remove-props): Don't mark the buffer modified.Stefan Monnier2007-03-081-1/+5
* Add 2007 to copyright years.Glenn Morris2007-01-211-1/+1
* Update my email address.Stefan Monnier2006-04-301-1/+1
* Update years in copyright notice; nfc.Thien-Thi Nguyen2006-02-061-1/+1
* 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
View Lorry Controller Status