diff tests/test-up-local-change.t @ 13740:dcb51f156fa6

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 23 Mar 2011 12:38:36 -0500
parents bc13e17067d9
children ffb5c09ba822
line wrap: on
line diff