Mercurial > emacs
diff lisp/vc/ediff-hook.el @ 110298:dd7892bf6d8d
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Fri, 10 Sep 2010 05:24:05 +0000 |
parents | 1b626601d32d |
children |
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Fri, 10 Sep 2010 05:24:05 +0000 |
parents | 1b626601d32d |
children |