diff tests/test-merge7.out @ 5271:5c2ca6d6ab21

Make test-convert-git compatible with other git versions (tested with 1.4.4.3)
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 31 Aug 2007 12:32:18 +0200
parents 93a4e72b4f83
children 17ed9b9a0d03
line wrap: on
line diff