diff tests/test-merge-default @ 11681:c5e555e064d0

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 25 Jul 2010 21:20:05 -0500
parents 95c7c4b7e67a
children
line wrap: on
line diff