Mercurial > emacs
diff lisp/vc/ediff-vers.el @ 109236:6a29de15d7fb
Merge from mainline.
author | Katsumi Yamaoka <katsumi@flagship2> |
---|---|
date | Tue, 06 Jul 2010 12:12:41 +0000 |
parents | c77749185234 |
children | 1b626601d32d |
author | Katsumi Yamaoka <katsumi@flagship2> |
---|---|
date | Tue, 06 Jul 2010 12:12:41 +0000 |
parents | c77749185234 |
children | 1b626601d32d |