Mercurial > emacs

log lisp/vc/smerge-mode.el @ 112402:a102f5772eaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Sat, 15 Jan 2011 15:16:57 -0800 Glenn Morris Nuke arch-tags.
Fri, 14 Jan 2011 13:10:15 -0500 Stefan Monnier * lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.
Fri, 14 Jan 2011 12:18:41 -0500 Stefan Monnier Merge from emacs-23
Fri, 12 Nov 2010 08:35:36 -0500 Stefan Monnier * lisp/vc/smerge-mode.el (smerge-refine): Choose better default part to
Mon, 14 Jun 2010 11:48:51 +0200 Joakim merged from trunk base lisp/smerge-mode.el@3c10ff6d1c3c
Thu, 24 Jun 2010 15:10:43 +0900 Kenichi Handa merge trunk base lisp/smerge-mode.el@1ed0b5afda6e
Fri, 11 Jun 2010 22:09:57 +0300 Juri Linkov * lisp/finder.el (finder-known-keywords): Add keyword "vc"
Fri, 11 Jun 2010 21:51:00 +0300 Juri Linkov Move version control related files to the "vc" subdirectory. base lisp/smerge-mode.el@1ed0b5afda6e
less more | (0) tip