Mercurial > emacs
comparison lisp/vc/ediff-init.el @ 109418:6e96aca307a4
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 27 Jun 2010 22:48:36 +0000 |
parents | e93288477c43 |
children | 1b626601d32d |
comparison
equal
deleted
inserted
replaced
109417:338717febe80 | 109418:6e96aca307a4 |
---|