Mercurial > emacs
diff lisp/vc/smerge-mode.el @ 110018:aa172fa85851
merge trunk
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Mon, 30 Aug 2010 09:15:54 +0900 |
parents | d928a6a7c3f2 |
children | c77749185234 68616bb3ae25 80d61d4081a0 |
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Mon, 30 Aug 2010 09:15:54 +0900 |
parents | d928a6a7c3f2 |
children | c77749185234 68616bb3ae25 80d61d4081a0 |