diff lisp/ediff-init.el @ 109205:f6714012e3cb

Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Thu, 27 May 2010 11:59:21 +0000
parents 1d1d5d9bd884
children 376148b31b5e
line wrap: on
line diff