lisp/ChangeLog: Update.
[bpt/emacs.git] / lisp / smerge-mode.el
2008-02-13 Stefan Monnier(smerge-auto-combine-max-separation): New var.
2008-02-04 Miles BaderMerge from emacs--rel--22
2008-02-01 Miles BaderMerge from emacs--rel--22
2008-02-01 Miles BaderMerge from emacs--rel--22
2008-01-31 Miles BaderMerge from emacs--rel--22
2008-01-30 Miles BaderMerge from emacs--devo--0
2008-01-30 Miles BaderMerge from emacs--rel--22
2008-01-29 Miles BaderMerge from emacs--rel--22
2008-01-22 Miles BaderMerge from emacs--rel--22
2008-01-16 Dan Nicolaescu* smerge-mode.el (smerge-start-session): Rename from...
2008-01-15 Stefan Monnier(smerge-refine): Also work on "same change conflicts".
2008-01-14 Dan Nicolaescu* smerge-mode.el (smerge-auto): New function.
2008-01-09 Miles BaderMerge from emacs--devo--0
2008-01-08 Miles BaderMerge from emacs--rel--22
2008-01-07 Glenn MorrisAdd 2008 to copyright years.
2008-01-02 Miles BaderMerge from emacs--rel--22, gnus--devo--0
2007-12-28 Miles BaderMerge from emacs--rel--22
2007-12-16 Miles BaderMerge from emacs--rel--22
2007-12-06 Miles BaderMerge from emacs--devo--0
2007-12-06 Miles BaderMerge from emacs--rel--22, gnus--devo--0
2007-12-06 Miles BaderMerge from emacs--rel--22
2007-11-21 Miles BaderMerge from emacs--rel--22
2007-11-19 Dan Nicolaescu* progmodes/octave-mod.el (inferior-octave-send-list...
2007-11-11 Miles BaderMerge from emacs--devo--0
2007-11-11 Miles BaderMerge from emacs--rel--22
2007-11-09 Miles BaderMerge from emacs--rel--22
2007-11-08 Stefan Monnier(smerge-refine-subst): Pass "-d" to diff.
2007-10-30 Miles BaderMerge from emacs--rel--22
2007-10-30 Miles BaderMerge from emacs--rel--22
2007-10-27 Miles BaderMerge from emacs--devo--0
2007-10-27 Miles BaderMerge from emacs--rel--22
2007-10-20 Dan Nicolaescu* term/x-win.el (x-gtk-stock-map, icon-map-list)
2007-10-20 Miles BaderMerge from emacs--devo--0
2007-10-20 Miles BaderMerge from emacs--devo--0
2007-10-20 Miles BaderMerge from emacs--rel--22
2007-10-20 Stefan Monnier(smerge-auto-refine): New var.
2007-10-19 Stefan MonnierAdd word-granularity refinement.
2007-10-18 Miles BaderMerge from emacs--rel--22
2007-10-18 Miles BaderMerge from emacs--rel--22
2007-10-16 Miles BaderMerge from emacs--rel--22
2007-10-15 Miles BaderMerge from emacs--rel--22
2007-10-11 Miles BaderMerge from emacs--devo--0
2007-10-09 Miles BaderMerge from emacs--rel--22
2007-10-09 Stefan Monnier(smerge-refine-chopup-region): Add `preproc' argument.
2007-08-21 Miles BaderMerge from emacs--devo--0
2007-08-21 Miles BaderMerge from emacs--devo--0
2007-08-21 Miles BaderMerge from emacs--rel--22
2007-08-16 Stefan Monnier(smerge-resolve): New arg `safe'.
2007-07-31 Miles BaderMerge from emacs--devo--0
2007-07-27 Miles BaderMerge from emacs--devo--0
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-25 Glenn MorrisSwitch license to GPLv3 or later.
2007-04-22 Karoly LorenteyMerged from emacs@sv.gnu.org
2007-03-18 Miles BaderMerge from emacs--devo--0
2007-03-12 Miles BaderMerge from emacs--devo--0
2007-03-08 Stefan Monnier(smerge-remove-props): Don't mark the buffer modified.
2007-01-29 Karoly LorenteyMerged from emacs@sv.gnu.org
2007-01-26 Miles BaderMerge from emacs--devo--0
2007-01-21 Glenn MorrisAdd 2007 to copyright years.
2006-05-03 Karoly LorenteyMerged from emacs@sv.gnu.org
2006-05-02 Miles BaderRevision: emacs@sv.gnu.org/emacs--unicode--0--patch-58
2006-04-30 Stefan MonnierUpdate my email address.
2006-02-12 Karoly LorenteyMerged from emacs@sv.gnu.org
2006-02-08 Miles BaderRevision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
2006-02-06 Thien-Thi NguyenUpdate years in copyright notice; nfc.
2006-01-16 Miles BaderRevision: miles@gnu.org--gnu-2005/emacs--unicode--0...
2005-11-01 Karoly LorenteyMerged from miles@gnu.org--gnu-2005 (patch 142-148...
2005-10-26 Romain FrancoiseAdd 'tools' to file keywords.
2005-10-09 Karoly LorenteyMerged from miles@gnu.org--gnu-2005 (patch 118-132...
2005-09-25 Miles BaderRevision: miles@gnu.org--gnu-2005/emacs--unicode--0...
2005-09-23 Stefan Monnier(smerge-remove-props): Cause re-highlighting of the...
2005-09-11 Miles BaderRevision: miles@gnu.org--gnu-2005/emacs--unicode--0...
2005-09-09 Karoly LorenteyMerged in changes from CVS trunk.
2005-09-09 Richard M. Stallman(smerge-resolve): Pass args to smerge-remove-props.
2005-09-06 Miles BaderRevision: miles@gnu.org--gnu-2005/emacs--unicode--0...
2005-09-04 Karoly LorenteyMerged in changes from CVS trunk. Plus added lisp...
2005-08-26 Miles BaderRevision: miles@gnu.org--gnu-2005/emacs--unicode--0...
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 NguyenUpdate years in copyright notice; nfc.
next