comparison tests/test-simplemerge.py @ 10263:25e572394f5c stable

Update license to GPLv2+
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Jan 2010 22:20:08 -0600
parents e75aab656f46
children 08a0f04b56bd
comparison
equal deleted inserted replaced
10262:eb243551cbd8 10263:25e572394f5c