view tests/test-merge3.out @ 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 91c56c427171
children
line wrap: on
line source

removing b
nothing changed