summaryrefslogtreecommitdiff
path: root/lisp/vc/smerge-mode.el
Commit message (Expand)AuthorAgeFilesLines
* * lisp/vc/diff-mode.el (diff-refine-changed): Rename fromJuri Linkov2014-06-181-1/+2
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
* * lisp/vc/smerge-mode.el (smerge-ediff): Choose default buffer names basedDavid Kastrup2013-11-251-6/+23
* * lisp/vc/smerge-mode.el: Remove redundant :group args.Stefan Monnier2013-08-281-16/+5
* Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
* * lisp/facemenu.el (list-colors-sort): Add option "Luminance".Juri Linkov2012-09-301-1/+1
* Replace version 24.2 with 24.3 where appropriate (hopefully)Glenn Morris2012-08-151-2/+2
* Reduce use of (require 'cl).Stefan Monnier2012-07-101-9/+9
* Use the same diff color scheme as in modern VCSes (bug#10181).Juri Linkov2012-05-251-26/+75
* Add new error and function `user-error'.Stefan Monnier2012-05-041-6/+3
* Minor-mode doc fixes for ARG behaviorGlenn Morris2012-02-071-0/+3
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
* Silence warning for unused `dotimes' counter variables.Juanma Barranquero2011-06-021-3/+3
* * lisp/vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark.Stefan Monnier2011-05-231-0/+1
* Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.Glenn Morris2011-05-121-2/+2
* Misc fixes, and use lexical-binding in more files.Stefan Monnier2011-03-111-1/+1
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-2/+1
* Nuke arch-tags.Glenn Morris2011-01-151-1/+0
* * lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.Stefan Monnier2011-01-141-2/+71
* Merge from emacs-23Stefan Monnier2011-01-141-1/+1
* * lisp/vc/smerge-mode.el (smerge-refine): Choose better default part toStefan Monnier2010-11-121-0/+4
* * lisp/finder.el (finder-known-keywords): Add keyword "vc"Juri Linkov2010-06-111-1/+1
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-0/+1231