Mercurial > emacs
diff lisp/vc/ediff-mult.el @ 109434:a11596ec5941
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Wed, 14 Jul 2010 22:46:23 +0000 |
parents | c77749185234 |
children | 1b626601d32d |
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Wed, 14 Jul 2010 22:46:23 +0000 |
parents | c77749185234 |
children | 1b626601d32d |