Mercurial > emacs
comparison lisp/smerge-mode.el @ 107007:e8989fe0a353
Merged from trunk
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Sun, 10 Jan 2010 22:18:39 +0800 |
parents | 098f8a47a308 |
children | 1d1d5d9bd884 |
comparison
equal
deleted
inserted
replaced
107006:8cf74d7922ce | 107007:e8989fe0a353 |
---|