comparison tests/test-merge2.out @ 1891:e5c8e38b788f

New version/release in mercurial.spec, patchbomb is now in hgext.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 12 Mar 2006 15:11:11 +0100
parents 5a034646e472
children b2ae81a7df29
comparison
equal deleted inserted replaced
1890:d4545f1b8bfa 1891:e5c8e38b788f