comparison etc/SERVICE @ 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 5a8fd913621c
children e6fdae9180d4 ef719132ddfa
comparison
equal deleted inserted replaced
94625:be875b5d451e 94626:5eb3ee73ed4e