diff tests/test-merge-default.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 013921c753bd
children 9cd6578750b9
line wrap: on
line diff