Mercurial > emacs
comparison lisp/ediff-merg.el @ 112264:01708c6828b7
merge emacs-23
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Fri, 14 Jan 2011 13:08:30 +0900 |
parents | 376148b31b5e |
children |
comparison
equal
deleted
inserted
replaced
112263:932e0e85675a | 112264:01708c6828b7 |
---|