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

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