SHA1 Hash:	7eecb079ed3c029eb31e6038e14bdd13f6592ece
Date:	2007-09-26 16:20:41
User:	drh
Comment:	Cleanup of the safemerge flag on update. Override available using the --force option.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/update.c from [ca0677b5f7] to [abfa21b27a].    [diff]