comparison tests/test-merge-revert.out @ 12010:ce818cf215dc

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