diff tests/test-merge8.out @ 12309:fe20536c09d4 stable

merge with crew
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Sep 2010 16:05:00 -0500
parents a3d73b3e1f8a
children
line wrap: on
line diff