summaryrefslogtreecommitdiff
path: root/lisp/vc/smerge-mode.el
Commit message (Expand)AuthorAgeFilesLines
* 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