comparison lisp/smerge-mode.el @ 83667:0e8db0b13648

Simplify log ready for merge into trunk. On merge, date to be replaced with merge date.
author Glenn Morris <rgm@gnu.org>
date Sun, 26 Aug 2007 01:56:56 +0000
parents 5b92bb6e6570
children 73661ddc7ac7 ccdbfad065e3 aaccdab0ee26
comparison
equal deleted inserted replaced
83666:084e7aa4713f 83667:0e8db0b13648