Mercurial > emacs
comparison lisp/ChangeLog @ 70111:9f68cc95e2da
Remove conflict marker.
| author | Romain Francoise <romain@orebokech.com> |
|---|---|
| date | Wed, 19 Apr 2006 06:29:47 +0000 |
| parents | 783755326039 |
| children | 15278e681be3 |
comparison
equal
deleted
inserted
replaced
| 70110:ce4a07c75843 | 70111:9f68cc95e2da |
|---|---|
| 214 | 214 |
| 215 2006-04-12 Romain Francoise <romain@orebokech.com> | 215 2006-04-12 Romain Francoise <romain@orebokech.com> |
| 216 | 216 |
| 217 * subr.el (read-passwd): Bind `message-log-max' to nil. | 217 * subr.el (read-passwd): Bind `message-log-max' to nil. |
| 218 | 218 |
| 219 >>>>>>> 1.9411 | |
| 220 2006-04-12 Stefan Monnier <monnier@iro.umontreal.ca> | 219 2006-04-12 Stefan Monnier <monnier@iro.umontreal.ca> |
| 221 | 220 |
| 222 * progmodes/perl-mode.el (perl-indent-new-calculate): | 221 * progmodes/perl-mode.el (perl-indent-new-calculate): |
| 223 Recompute parse-start after jumping backward by a whole sexp. | 222 Recompute parse-start after jumping backward by a whole sexp. |
| 224 | 223 |