Mercurial > emacs
comparison lisp/vc/emerge.el @ 111570:ffe2002d45c4
merge trunk
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Wed, 08 Sep 2010 12:55:57 +0900 |
parents | d928a6a7c3f2 |
children | c77749185234 ac911360c429 |
comparison
equal
deleted
inserted
replaced
111569:0187fc875872 | 111570:ffe2002d45c4 |
---|