diff tests/test-merge8.out @ 11733:b43cfaf571d6

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Aug 2010 10:55:51 -0500
parents a3d73b3e1f8a
children
line wrap: on
line diff