diff hgmerge @ 1868:6a3d5a56f19c

merge with self.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 08 Mar 2006 18:48:40 -0800
parents d610fe0e6893
children 05c7d75be925
line wrap: on
line diff