diff lwlib/lwlib-Xm.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 (2008-05-05)
parents a1c6fb73c033
children 606f2d163a64 9588c3703f38
line wrap: on
line diff