comparison tests/test-bad-pull.t @ 15002:b55c1c6a793e

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Aug 2011 14:52:11 -0500
parents 97ffc68f71d3
children c5c9ca3719f9
comparison
equal deleted inserted replaced
14999:f6a737357195 15002:b55c1c6a793e