Mercurial > emacs
comparison lisp/vc/ediff-help.el @ 110236:6c9f59d296d3
Merge changes from emacs-23 branch.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 06 Sep 2010 12:38:03 -0400 |
| parents | 280c8ae2476d |
| children | 1b626601d32d 417b1e4d63cd |
comparison
equal
deleted
inserted
replaced
| 110224:3d216398af49 | 110236:6c9f59d296d3 |
|---|