diff tests/test-merge-revert.out @ 10263:25e572394f5c stable

Update license to GPLv2+
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Jan 2010 22:20:08 -0600
parents d2b55e3c4e25
children 4c94b6d0fb1c
line wrap: on
line diff