diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-05-05 06:16:20 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-05-05 06:16:20 +0000 |
| commit | 8653eee82efbe2b3b14f671f3f991c356c2a5065 (patch) | |
| tree | 2bb58e500e780ac9ced113d90818282b903e9162 /lisp/emacs-lisp/gulp.el | |
| parent | 6494957aaac593338de005e914c9eed4faded1c1 (diff) | |
| download | emacs-8653eee82efbe2b3b14f671f3f991c356c2a5065.tar.gz emacs-8653eee82efbe2b3b14f671f3f991c356c2a5065.tar.bz2 emacs-8653eee82efbe2b3b14f671f3f991c356c2a5065.zip | |
(smerge-start-session): Don't call smerge-next if
looking at conflict marker.
Diffstat (limited to 'lisp/emacs-lisp/gulp.el')
0 files changed, 0 insertions, 0 deletions