diff tests/test-merge-subrepos.t @ 21757:c00822e0b8ea

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 14 Jun 2014 11:56:20 -0500
parents 0f64af33fb63
children 439b4d005b4a
line wrap: on
line diff