diff tests/test-merge7 @ 11733:b43cfaf571d6

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