comparison tests/test-bad-pull.t @ 26885:8b2fbe3f59b1

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 09 Nov 2015 12:49:21 -0600
parents 8c14f87bd0ae
children 280528245ecf
comparison
equal deleted inserted replaced
26879:a24b98f4e03c 26885:8b2fbe3f59b1