diff tests/test-merge-subrepos.t @ 13558:f854b775c386

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Mar 2011 15:46:46 -0600
parents 6169493ac3f9
children 0f64af33fb63
line wrap: on
line diff