comparison tests/test-merge10.t @ 15660:c7b0bedbb07a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 15 Dec 2011 16:50:21 -0600
parents 4c94b6d0fb1c
children f2719b387380
comparison
equal deleted inserted replaced
15659:7fba5a245acc 15660:c7b0bedbb07a