diff lisp/smerge-mode.el @ 108774:895ee2ff8cc3

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 25 May 2010 07:23:37 +0000
parents 46ac70591556
children
line wrap: on
line diff