Mercurial > emacs
diff lisp/vc/ediff.el @ 109608:768a90ad492c
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 01 Aug 2010 22:48:29 +0000 |
parents | c77749185234 |
children | 1b626601d32d |
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 01 Aug 2010 22:48:29 +0000 |
parents | c77749185234 |
children | 1b626601d32d |