Mercurial > emacs
diff lisp/ediff-merg.el @ 91000:cd5e99697764
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 843-844)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 84-87)
- Update from CVS
- Change capitalization of VC backend names for new backends
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-241
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 03 Aug 2007 05:57:16 +0000 |
parents | f55f9811f5d7 |
children | 53108e6cea98 |