diff tests/test-import-merge.t @ 15596:2555f441a32f

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 01 Dec 2011 01:42:03 -0600
parents 6cae68a361ed
children f2719b387380
line wrap: on
line diff