Mercurial > emacs

diff lisp/smerge-mode.el @ 106933:2afe12cb88f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 13 Jan 2010 23:35:16 +0000
parents 1d1d5d9bd884
children 46ac70591556 376148b31b5e
line wrap: on
line diff