diff lisp/vc/ediff-merg.el @ 109998:529971ebf9b1

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 18 Aug 2010 22:46:56 +0000
parents c77749185234
children 1b626601d32d
line wrap: on
line diff