diff tests/test-simplemerge-cmd.out @ 9939:251812d34c08 stable

Merge stable heads
author Matt Mackall <mpm@selenic.com>
date Wed, 25 Nov 2009 21:54:18 -0600
parents e1f4343db740
children
line wrap: on
line diff