diff tests/test-bad-pull @ 4356:10edaed7f909

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Apr 2007 12:37:30 -0500
parents 66249be9aa23
children e3a0c092b4e2
line wrap: on
line diff