diff tests/test-merge-revert @ 9939:251812d34c08 stable

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