diff hgmerge @ 2922:773c5b82d052

override previous merge with mpm. merge at ef8ee4477019 was bad.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 16 Aug 2006 10:52:42 -0700
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff