view tests/test-merge3.out @ 3928:4df475e22248

Sync with -stable
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Dec 2006 21:48:22 -0600
parents 91c56c427171
children
line wrap: on
line source

removing b
nothing changed