comparison tests/test-merge5.t @ 12010:ce818cf215dc

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 21 Aug 2010 10:48:49 -0500
parents ef4a1ffbf519
children c85e07a2d783
comparison
equal deleted inserted replaced
12007:652f71b235bf 12010:ce818cf215dc