diff tests/test-merge6.t @ 13965:ac1c75a7c6b5

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 20 Apr 2011 12:44:32 -0500
parents ffb5c09ba822
children f2719b387380
line wrap: on
line diff