Mercurial > emacs
diff lisp/vc/ediff-hook.el @ 112321:dc74e58f6b0b
Merge from mainline.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Tue, 11 Jan 2011 21:57:19 -0800 |
parents | 280c8ae2476d |
children | 1b626601d32d 417b1e4d63cd |
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Tue, 11 Jan 2011 21:57:19 -0800 |
parents | 280c8ae2476d |
children | 1b626601d32d 417b1e4d63cd |