diff tests/test-merge5 @ 2819:90a4181ca9ed

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