Mercurial > emacs
comparison lisp/vc/ediff.el @ 112138:3d3d7ef762fd
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Thu, 06 Jan 2011 21:16:15 -0800 |
| parents | a3e1f7134e6e |
| children | 1b626601d32d 417b1e4d63cd |
comparison
equal
deleted
inserted
replaced
| 112120:aa1843c74710 | 112138:3d3d7ef762fd |
|---|