view tests/test-merge3.out @ 5046:bf444a9a9c23

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 01 Aug 2007 14:03:48 -0500
parents 91c56c427171
children
line wrap: on
line source

removing b
nothing changed