comparison lisp/smerge-mode.el @ 108425:09e9c8115173

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sat, 27 Feb 2010 13:17:05 +0000
parents 1d1d5d9bd884
children 46ac70591556 376148b31b5e
comparison
equal deleted inserted replaced
108424:a8944be1e493 108425:09e9c8115173