Mercurial > emacs
comparison lisp/ediff-init.el @ 109709:0a7e386737b1
merge trunk
author | Kenichi Handa <handa@etlken> |
---|---|
date | Fri, 06 Aug 2010 12:54:13 +0900 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
comparison
equal
deleted
inserted
replaced
109690:cd3f51128c38 | 109709:0a7e386737b1 |
---|