| 2009-09-08 |
Stefan Monnier |
(smerge-remove-props, smerge-refine):
|
| 2009-09-01 |
Glenn Morris |
Mark face aliases with "-face" suffix as obsolete.
|
| 2009-02-02 |
Thien-Thi Nguyen |
(smerge-start-session): Add interactive spec.
|
| 2009-01-05 |
Glenn Morris |
Add 2009 to copyright years.
|
| 2008-10-28 |
Stefan Monnier |
Require diff-mode at run-time as well.
|
| 2008-07-21 |
Thien-Thi Nguyen |
Make auto-refining a minor mode, and diff- and smerge- use it.
|
| 2008-05-12 |
Stefan Monnier |
(smerge-apply-resolution-patch): Don't pass nil to `insert'.
|
| 2008-05-11 |
Reiner Steib |
(smerge-start-session): Revert unintended change in revision 1.69.
|
| 2008-05-11 |
Glenn Morris |
Re-fill copyright years.
|
| 2008-05-10 |
Reiner Steib |
(smerge-command-prefix): Fix custom type.
|
| 2008-05-06 |
Glenn Morris |
Switch to recommended form of GPLv3 permissions notice.
|
| 2008-05-05 |
Stefan Monnier |
(smerge-start-session): Don't call smerge-next if
|
| 2008-04-11 |
Stefan Monnier |
(smerge-apply-resolution-patch): Fix typo.
|
| 2008-03-31 |
Stefan Monnier |
(smerge-apply-resolution-patch): New fun.
|
| 2008-03-31 |
Stefan Monnier |
(smerge-refine): Allow highlighting other subparts in 3-way conflicts.
|
| 2008-02-13 |
Stefan Monnier |
(smerge-auto-combine-max-separation): New var.
|
| 2008-01-30 |
Miles Bader |
Merge from emacs--devo--0
|
| 2008-01-09 |
Miles Bader |
Merge from emacs--devo--0
|
| 2007-12-06 |
Miles Bader |
Merge from emacs--devo--0
|
| 2007-11-11 |
Miles Bader |
Merge from emacs--devo--0
|
| 2007-10-27 |
Miles Bader |
Merge from emacs--devo--0
|
| 2007-10-20 |
Miles Bader |
Merge from emacs--devo--0
|
| 2007-10-20 |
Miles Bader |
Merge from emacs--devo--0
|
| 2007-10-11 |
Miles Bader |
Merge from emacs--devo--0
|
| 2007-08-21 |
Miles Bader |
Merge from emacs--devo--0
|
| 2007-07-27 |
Miles Bader |
Merge from emacs--devo--0
|
| 2007-03-18 |
Miles Bader |
Merge from emacs--devo--0
|
| 2007-01-26 |
Miles Bader |
Merge from emacs--devo--0
|
| 2006-05-02 |
Miles Bader |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-58
|
| 2006-02-08 |
Miles Bader |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
|
| 2006-01-16 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
|
| 2005-09-25 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-85
|
| 2005-09-11 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-81
|
| 2005-09-06 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-79
|
| 2005-08-26 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
|
| 2005-07-29 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-74
|
| 2005-07-07 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68
|
| 2005-06-24 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-65
|
| 2005-06-15 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-63
|
| 2005-04-09 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35
|
| 2004-06-28 |
Miles Bader |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
|
| 2004-04-16 |
Kenichi Handa |
Sync to HEAD
|
| 2006-01-16 |
Henrik Enberg |
sync with trunk
|
| 2003-09-08 |
Kenichi Handa |
New directory
|
| 2008-01-16 |
Dan Nicolaescu |
* smerge-mode.el (smerge-start-session): Rename from smerge-auto.
|
| 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-08 |
Miles Bader |
Merge from emacs--rel--22
|
| 2007-11-19 |
Dan Nicolaescu |
* progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
|
| 2007-11-08 |
Stefan Monnier |
(smerge-refine-subst): Pass "-d" to diff.
|
| 2007-10-20 |
Dan Nicolaescu |
* term/x-win.el (x-gtk-stock-map, icon-map-list)
|
| 2007-10-20 |
Stefan Monnier |
(smerge-auto-refine): New var.
|
| 2007-10-19 |
Stefan Monnier |
Add word-granularity refinement.
|
| 2007-10-09 |
Stefan Monnier |
(smerge-refine-chopup-region): Add `preproc' argument.
|
| 2007-04-22 |
Karoly Lorentey |
Merged from emacs@sv.gnu.org
|
| 2007-01-29 |
Karoly Lorentey |
Merged from emacs@sv.gnu.org
|
| 2006-05-03 |
Karoly Lorentey |
Merged from emacs@sv.gnu.org
|
| 2006-02-12 |
Karoly Lorentey |
Merged from emacs@sv.gnu.org
|
| 2005-11-01 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 142-148, 615-628)
|
| 2005-10-09 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 118-132, 551-577)
|
