diff tests/test-bad-pull.t @ 14481:b2ee161328e0

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 31 May 2011 15:28:23 -0500
parents 97ffc68f71d3
children c5c9ca3719f9
line wrap: on
line diff