diff tests/test-up-local-change.t @ 13338:8f5c865b7b4a

merge with self
author Matt Mackall <mpm@selenic.com>
date Tue, 01 Feb 2011 17:53:50 -0600
parents bc13e17067d9
children ffb5c09ba822
line wrap: on
line diff