Mercurial > emacs

log lisp/smerge-mode.el @ 105653:8177db6744a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
2009-10-04 Juanma Barranquero Fix typos in comments.
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)
2005-09-09 Karoly Lorentey Merged in changes from CVS trunk.
2005-09-04 Karoly Lorentey Merged in changes from CVS trunk. Plus added lisp/term tweaks.
2005-07-05 Karoly Lorentey Merged from miles@gnu.org--gnu-2005 (patch 469)
2005-07-05 Karoly Lorentey Merged from miles@gnu.org--gnu-2005 (patch 83-87, 449-468)
2005-06-21 Karoly Lorentey Merged from miles@gnu.org--gnu-2005 (patch 423-434)
2005-06-15 Karoly Lorentey Merged from miles@gnu.org--gnu-2005 (patch 80-82, 350-422)
2005-04-11 Karoly Lorentey Merged from miles@gnu.org--gnu-2005 (patch 59, 240-245)
2005-04-04 Karoly Lorentey Merged from miles@gnu.org--gnu-2005 (patch 45-55, 214-231)
2004-05-01 Karoly Lorentey Merged in changes from CVS trunk.
2004-04-16 Karoly Lorentey Merged in changes from CVS trunk.
2004-04-15 Karoly Lorentey Merged in changes from CVS trunk.
2004-03-25 Karoly Lorentey Merged in changes from CVS HEAD
2004-03-19 Karoly Lorentey Merged in changes from CVS HEAD
2004-03-16 Karoly Lorentey Merged in changes from CVS HEAD
2008-05-10 Reiner Steib (smerge-command-prefix): Fix custom type.
2008-01-07 Glenn Morris Add 2008 to copyright years.
2007-08-16 Stefan Monnier (smerge-resolve): New arg `safe'.
2007-07-25 Glenn Morris Switch license to GPLv3 or later.
2007-03-08 Stefan Monnier (smerge-remove-props): Don't mark the buffer modified.
2007-01-21 Glenn Morris Add 2007 to copyright years.
2006-04-30 Stefan Monnier Update my email address.
2006-02-06 Thien-Thi Nguyen Update years in copyright notice; nfc.
2005-10-26 Romain Francoise Add 'tools' to file keywords.
2005-09-23 Stefan Monnier (smerge-remove-props): Cause re-highlighting of the whole conflict.
2005-09-09 Richard M. Stallman (smerge-resolve): Pass args to smerge-remove-props.
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 Nguyen Update years in copyright notice; nfc.
2005-07-26 Stefan Monnier (smerge-ediff): Use insert-buffer-substring.
2005-07-04 Lute Kamstra Update FSF's address.
2005-07-03 Richard M. Stallman (smerge-mode): Add duplicate defvar near top.
2005-06-16 Juanma Barranquero (smerge-ensure-match): Don't use `format' on `error' arguments.
2005-06-10 Miles Bader Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
2005-04-08 Dan Nicolaescu * mh-customize.el (mh-speedbar-selected-folder-face): Special case
2005-04-04 Lute Kamstra (smerge-mode): Specify :group.
2004-04-30 Juanma Barranquero (smerge-diff-switches): Fix typo in docstring.
2004-04-15 Stefan Monnier (smerge-match-conflict): Fix last change.
2004-04-15 Stefan Monnier (smerge-match-conflict): Try to do something sensible
2004-04-14 Stefan Monnier (smerge-popup-context-menu): Use it.
2004-03-23 Stefan Monnier (smerge-mode-menu): Fix activate pred for resolve.
2004-03-16 Masatake YAMATO (smerge-popup-context-menu): Put `unwind-protect' arround `overlay-put' and `popup-menu'.
2004-03-15 Masatake YAMATO 2004-03-15 Masatake YAMATO <jet@gyve.org>
2004-03-10 Stefan Monnier (smerge-check-cache, smerge-check): New var and fun.
2003-12-24 Karoly Lorentey tag of miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-137
2003-10-06 Dave Love Previous change was bogus. Something odd in pcl-cvs...
2003-10-06 Dave Love Comment.
2003-09-01 Miles Bader Add arch taglines
2003-02-04 Juanma Barranquero Trailing whitespace deleted.
2002-10-10 Stefan Monnier (smerge-ediff): Autoload.
2002-10-10 Stefan Monnier (smerge-ediff): Autoload.
2002-10-04 Stefan Monnier (smerge-ediff): Add name-{mine,other,base} args.
2002-09-03 Stefan Monnier (smerge-diff-buffer-name): Default to *vc-diff*.
2002-08-15 Stefan Monnier Use find-file-hook instead of find-file-hooks.
2001-11-15 Stefan Monnier (smerge-match-conflict): Fix typo.
2001-07-31 Gerd Moellmann (smerge-mode): Check if `font-lock-mode' is bound
2001-05-10 Stefan Monnier (smerge-mode): Force font-lock-multiline to t.
2001-03-07 Stefan Monnier (font-lock-keywords, font-lock-mode): Don't bind, just declare.
2001-01-25 Stefan Monnier (smerge-font-lock-keywords): Relax submatch 1.
2000-12-23 Stefan Monnier *** empty log message ***
2000-12-22 Stefan Monnier (smerge-basic-map): Use `=' rather than `d'.
2000-12-22 Stefan Monnier (smerge-basic-map): Use `=' rather than `d'.
2000-10-06 Stefan Monnier (smerge-diff): Setup the buffer's default-directory
2000-10-05 Miles Bader (smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
2000-08-16 Stefan Monnier (smerge-mode-menu): Doc fix.
2000-07-21 Dave Love (smerge-mode-menu): Fill it out.
2000-05-25 Dave Love (smerge-diff-switches): Don't use list* in defcustom.
2000-03-22 Stefan Monnier (smerge-auto-leave): New function and variable.
1999-12-09 Stefan Monnier New file. Provides a simple minor-mode for files containing
less more | (0) tip