diff tests/test-merge-revert.out @ 4312:5e05007d3857

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Apr 2007 17:09:31 -0500
parents d2b55e3c4e25
children
line wrap: on
line diff