Mercurial > emacs
comparison lisp/vc/ediff-wind.el @ 110534:826d60163924
Merge changes from emacs-23 branch.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 23 Sep 2010 22:10:54 -0400 |
| parents | 280c8ae2476d |
| children | 1b626601d32d e60b0b3ed516 |
comparison
equal
deleted
inserted
replaced
| 110517:64945cefe6a6 | 110534:826d60163924 |
|---|