Mercurial > emacs

comparison lisp/vc/smerge-mode.el @ 109228:266c496c7220

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Tue, 22 Jun 2010 13:27:02 +0000
parents 1d9fd74dc4ac
children
comparison
equal deleted inserted replaced
109227:2b07fb05e3ed 109228:266c496c7220