Mercurial > emacs

comparison lisp/smerge-mode.el @ 79645:4d283165b713

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from gnus--rel--5.10 Revision: emacs@sv.gnu.org/emacs--rel--22--patch-172
author Miles Bader <miles@gnu.org>
date Fri, 28 Dec 2007 22:27:01 +0000
parents 5b92bb6e6570
children 73661ddc7ac7 ccdbfad065e3 aaccdab0ee26
comparison
equal deleted inserted replaced
79644:984a5e469e54 79645:4d283165b713