Mercurial > emacs

comparison lisp/smerge-mode.el @ 88104:d4d0381a59d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1032
author Miles Bader <miles@gnu.org>
date Fri, 01 Feb 2008 02:40:23 +0000
parents 8f1628da223f
children c70e45a7acfd ca1e1298a3d8
comparison
equal deleted inserted replaced
88103:d6247c939edc 88104:d4d0381a59d8