Mercurial > emacs
diff lisp/vc/ediff-hook.el @ 109238:7be7159afb6f
Merge from mainline.
author | Katsumi Yamaoka <katsumi@flagship2> |
---|---|
date | Thu, 08 Jul 2010 11:50:25 +0000 |
parents | c77749185234 |
children | 1b626601d32d |
author | Katsumi Yamaoka <katsumi@flagship2> |
---|---|
date | Thu, 08 Jul 2010 11:50:25 +0000 |
parents | c77749185234 |
children | 1b626601d32d |