Mercurial > emacs
comparison lisp/mwheel.el @ 106981:e3fcbe16deae
merge conflict
| author | Mark A. Hershberger <mhershberger@intrahealth.org> |
|---|---|
| date | Sun, 24 Jan 2010 23:52:26 -0500 |
| parents | 1d1d5d9bd884 |
| children | 4abde609aac9 376148b31b5e |
comparison
equal
deleted
inserted
replaced
| 106980:66e0d01014c6 | 106981:e3fcbe16deae |
|---|