Mercurial > emacs
comparison admin/admin.el @ 94626:5eb3ee73ed4e
(smerge-start-session): Don't call smerge-next if
looking at conflict marker.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 05 May 2008 06:16:20 +0000 |
| parents | 5c2a2ef4063c |
| children | 606f2d163a64 e6db9ee945b8 |
comparison
equal
deleted
inserted
replaced
| 94625:be875b5d451e | 94626:5eb3ee73ed4e |
|---|