Add 2010 to copyright years.
[bpt/emacs.git] / lisp / smerge-mode.el
2010-01-13 Glenn MorrisAdd 2010 to copyright years.
2009-10-04 Juanma BarranqueroFix typos in comments.
2009-09-28 Chong YidongCEDET (development tools) package merged.
2009-09-08 Stefan Monnier(smerge-remove-props, smerge-refine):
2009-09-01 Glenn MorrisMark face aliases with "-face" suffix as obsolete.
2009-02-02 Thien-Thi Nguyen(smerge-start-session): Add interactive spec.
2009-01-05 Glenn MorrisAdd 2009 to copyright years.
2008-10-28 Stefan MonnierRequire diff-mode at run-time as well.
2008-09-30 Miles BaderMerge from emacs--rel--22
2008-09-05 Miles BaderMerge from emacs--rel--22
2008-09-02 Miles BaderMerge from emacs--rel--22
2008-08-18 Miles BaderMerge from emacs--rel--22
2008-08-12 Miles BaderMerge from emacs--rel--22
2008-07-26 Miles BaderMerge from emacs--rel--22
2008-07-21 Thien-Thi NguyenMake auto-refining a minor mode, and diff- and smerge...
2008-07-17 Miles BaderMerge from emacs--rel--22
2008-07-17 Miles BaderMerge from emacs--rel--22
2008-06-17 Miles BaderMerge from emacs--rel--22
2008-06-01 Miles BaderMerge from emacs--rel--22
2008-05-26 Miles BaderMerge from emacs--rel--22
2008-05-18 Miles BaderMerge from emacs--rel--22
2008-05-16 Miles BaderMerge from emacs--rel--22
2008-05-14 Miles BaderMerge from emacs--rel--22
2008-05-12 Stefan Monnier(smerge-apply-resolution-patch): Don't pass nil to...
2008-05-11 Reiner Steib(smerge-start-session): Revert unintended change in...
2008-05-11 Glenn MorrisRe-fill copyright years.
2008-05-10 Reiner Steib(smerge-command-prefix): Fix custom type.
2008-05-10 Reiner Steib(smerge-command-prefix): Fix custom type.
2008-05-08 Miles BaderMerge from emacs--rel--22
2008-05-06 Glenn MorrisSwitch to recommended form of GPLv3 permissions notice.
2008-05-05 Stefan Monnier(smerge-start-session): Don't call smerge-next if
2008-05-04 Miles BaderMerge from emacs--rel--22
2008-05-02 Miles BaderMerge from emacs--rel--22
2008-04-29 Miles BaderMerge from emacs--rel--22
2008-04-26 Miles BaderMerge from emacs--rel--22
2008-04-24 Miles BaderMerge from emacs--rel--22
2008-04-23 Miles BaderMerge from emacs--rel--22
2008-04-18 Miles BaderMerge from emacs--rel--22
2008-04-11 Stefan Monnier(smerge-apply-resolution-patch): Fix typo.
2008-04-05 Miles BaderMerge from emacs--rel--22
2008-03-31 Stefan Monnier(smerge-apply-resolution-patch): New fun.
2008-03-31 Stefan Monnier(smerge-refine): Allow highlighting other subparts...
2008-03-10 Miles BaderMerge from emacs--rel--22
2008-03-01 Miles BaderMerge from emacs--rel--22
2008-02-25 Miles BaderMerge from emacs--rel--22
2008-02-24 Miles BaderMerge from emacs--rel--22
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
next