diff tests/test-simplemerge-cmd.out @ 12010:ce818cf215dc

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 21 Aug 2010 10:48:49 -0500
parents e1f4343db740
children
line wrap: on
line diff