comparison lisp/vc/ediff-hook.el @ 110001:87dd0fd298be

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 22 Aug 2010 22:56:05 +0000
parents c77749185234
children 1b626601d32d
comparison
equal deleted inserted replaced
110000:757182d1d4cb 110001:87dd0fd298be