diff lisp/vc/ediff-hook.el @ 109351:c8a969d13eda

merge trunk
author Kenichi Handa <handa@etlken>
date Fri, 09 Jul 2010 15:55:27 +0900
parents c77749185234
children 1b626601d32d
line wrap: on
line diff