diff lisp/vc/ediff-wind.el @ 110135:42aea1f448f8

merge trunk
author Kenichi Handa <handa@m17n.org>
date Thu, 02 Sep 2010 09:58:05 +0900
parents 280c8ae2476d
children 1b626601d32d e60b0b3ed516
line wrap: on
line diff