code.delx.au - gnu-emacs/history - lisp/smerge-mode.el

]> code.delx.au - gnu-emacs/history - lisp/smerge-mode.el

2008-05-06	Glenn Morris	Switch to recommended form of GPLv3 permissions notice.	blob \| commitdiff \| raw
2008-05-05	Stefan Monnier	(smerge-start-session): Don't call smerge-next if	blob \| commitdiff \| raw \| diff to current
2008-05-04	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-05-02	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-04-29	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-04-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-04-24	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-04-23	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-04-18	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-04-11	Stefan Monnier	(smerge-apply-resolution-patch): Fix typo.	blob \| commitdiff \| raw \| diff to current
2008-04-05	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-03-31	Stefan Monnier	(smerge-apply-resolution-patch): New fun.	blob \| commitdiff \| raw \| diff to current
2008-03-31	Stefan Monnier	(smerge-refine): Allow highlighting other subparts...	blob \| commitdiff \| raw \| diff to current
2008-03-10	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-03-01	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-02-25	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-02-24	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-02-13	Stefan Monnier	(smerge-auto-combine-max-separation): New var.	blob \| commitdiff \| raw \| diff to current
2008-02-04	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-02-01	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-02-01	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-01-31	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-01-30	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2008-01-30	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-01-29	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-01-22	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-01-16	Dan Nicolaescu	* smerge-mode.el (smerge-start-session): Rename from...	blob \| commitdiff \| raw \| diff to current
2008-01-15	Stefan Monnier	(smerge-refine): Also work on "same change conflicts".	blob \| commitdiff \| raw \| diff to current
2008-01-14	Dan Nicolaescu	* smerge-mode.el (smerge-auto): New function.	blob \| commitdiff \| raw \| diff to current
2008-01-09	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2008-01-08	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-01-07	Glenn Morris	Add 2008 to copyright years.	blob \| commitdiff \| raw \| diff to current
2008-01-02	Miles Bader	Merge from emacs--rel--22, gnus--devo--0	blob \| commitdiff \| raw \| diff to current
2007-12-28	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-12-16	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-12-06	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-12-06	Miles Bader	Merge from emacs--rel--22, gnus--devo--0	blob \| commitdiff \| raw \| diff to current
2007-12-06	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-11-21	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-11-19	Dan Nicolaescu	* progmodes/octave-mod.el (inferior-octave-send-list...	blob \| commitdiff \| raw \| diff to current
2007-11-11	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-11-11	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-11-09	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-11-08	Stefan Monnier	(smerge-refine-subst): Pass "-d" to diff.	blob \| commitdiff \| raw \| diff to current
2007-10-30	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-30	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-27	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-10-27	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-20	Dan Nicolaescu	* term/x-win.el (x-gtk-stock-map, icon-map-list)	blob \| commitdiff \| raw \| diff to current
2007-10-20	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-10-20	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-10-20	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-20	Stefan Monnier	(smerge-auto-refine): New var.	blob \| commitdiff \| raw \| diff to current
2007-10-19	Stefan Monnier	Add word-granularity refinement.	blob \| commitdiff \| raw \| diff to current
2007-10-18	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-18	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-16	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-15	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-11	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-10-09	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-09	Stefan Monnier	(smerge-refine-chopup-region): Add `preproc' argument.	blob \| commitdiff \| raw \| diff to current
2007-08-21	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-08-21	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-08-21	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-08-16	Stefan Monnier	(smerge-resolve): New arg `safe'.	blob \| commitdiff \| raw \| diff to current
2007-07-31	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-07-27	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-25	Glenn Morris	Switch license to GPLv3 or later.	blob \| commitdiff \| raw \| diff to current
2007-04-22	Karoly Lorentey	Merged from emacs@sv.gnu.org	blob \| commitdiff \| raw \| diff to current
2007-03-18	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-03-12	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-03-08	Stefan Monnier	(smerge-remove-props): Don't mark the buffer modified.	blob \| commitdiff \| raw \| diff to current
2007-01-29	Karoly Lorentey	Merged from emacs@sv.gnu.org	blob \| commitdiff \| raw \| diff to current
2007-01-26	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-01-21	Glenn Morris	Add 2007 to copyright years.	blob \| commitdiff \| raw \| diff to current
2006-05-03	Karoly Lorentey	Merged from emacs@sv.gnu.org	blob \| commitdiff \| raw \| diff to current
2006-05-02	Miles Bader	Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-58	blob \| commitdiff \| raw \| diff to current
2006-04-30	Stefan Monnier	Update my email address.	blob \| commitdiff \| raw \| diff to current
2006-02-12	Karoly Lorentey	Merged from emacs@sv.gnu.org	blob \| commitdiff \| raw \| diff to current
2006-02-08	Miles Bader	Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13	blob \| commitdiff \| raw \| diff to current
next

RSS Atom