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

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