diff tests/test-pull-pull-corruption.out @ 2819:90a4181ca9ed

Fix extensions for merge change
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Aug 2006 17:26:09 -0500
parents b2ae81a7df29
children
line wrap: on
line diff