sync scintilla with hg base