comparison tests/test-bad-pull.t @ 19937:1596f2d8f242 stable 2.8-rc

merge default into stable for 2.8 freeze
author Matt Mackall <mpm@selenic.com>
date Sun, 20 Oct 2013 16:43:11 -0700
parents 5d0538599428
children 7a9cbb315d84
comparison
equal deleted inserted replaced
19914:f91e932b2cfe 19937:1596f2d8f242