diff tests/test-issue522 @ 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 90d9ec0dc69d
children 6c82beaaa11a
line wrap: on
line diff