view tests/test-merge3.out @ 5587:121f9dbcc236

update test output
author Matt Mackall <mpm@selenic.com>
date Sun, 02 Dec 2007 16:26:56 -0600
parents 91c56c427171
children
line wrap: on
line source

removing b
nothing changed