comparison tests/test-merge-subrepos.t @ 24942:8174d27576a3

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 06 May 2015 16:56:28 -0500
parents 0f64af33fb63
children 439b4d005b4a
comparison
equal deleted inserted replaced
24941:9c1942635c1f 24942:8174d27576a3