diff README @ 6723:1fe6f365df2e

merge: only in-branch merges can be implicit
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 23 Jun 2008 15:02:52 +0200
parents 1158d7018052
children 1de6e7e1bb9f
line wrap: on
line diff