diff tests/test-rename-merge2.out @ 5672:8a65ea986755

Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 27 Dec 2007 13:39:03 +0100
parents 4b6f0aa568e5
children c2a21fe60994
line wrap: on
line diff