diff src/gmalloc.c @ 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 b7a5a89054dc
children 6e2a8cad250c
line wrap: on
line diff