comparison tests/test-merge8.t @ 17059:fba17a64fa49

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 29 Jun 2012 00:40:52 -0500
parents f2719b387380
children eb586ed5d8ce
comparison
equal deleted inserted replaced
17058:d5422faf648c 17059:fba17a64fa49