Mercurial > emacs
diff lisp/vc/ediff-hook.el @ 110000:757182d1d4cb
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Thu, 19 Aug 2010 22:47:51 +0000 |
parents | c77749185234 |
children | 1b626601d32d |
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Thu, 19 Aug 2010 22:47:51 +0000 |
parents | c77749185234 |
children | 1b626601d32d |