Mercurial > emacs
comparison etc/tutorials/TUTORIAL.translators @ 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 | 8494625edf98 |
children | c18e82c381e4 |
comparison
equal
deleted
inserted
replaced
94625:be875b5d451e | 94626:5eb3ee73ed4e |
---|